kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-11 23:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

use string fields for some stuff in ast_channel

Browse Source 
const-ify some more APIs
remove 'type' field from ast_channel, in favor of the one in the channel's tech structure
allow string field module users to specify the 'chunk size' for pool allocations
update chan_alsa to be compatible with recent const-ification patches


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-02-01 23:05:28 +00:00
parent f246b9fc64
commit a16ae226b6
45 changed files with 306 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/asterisk/channel.h
View File

@@ -113,6 +113,7 @@ extern "C" {
#include "asterisk/cdr.h"
#include "asterisk/utils.h"
#include "asterisk/linkedlists.h"
#include "asterisk/stringfields.h"
#define MAX_LANGUAGE 20
@@ -266,24 +267,23 @@ struct ast_channel_spy_list;
* this structure is changed. XXX
*/
struct ast_channel {
/*! ASCII unique channel name */
char name[AST_CHANNEL_NAME];
/*! Technology (point to channel driver) */
const struct ast_channel_tech *tech;
/*! Private data used by the technology driver */
void *tech_pvt;
/*! Language requested for voice prompts */
char language[MAX_LANGUAGE];
/*! Type of channel */
const char *type;
AST_DECLARE_STRING_FIELDS(
AST_STRING_FIELD(name); /*! ASCII unique channel name */
AST_STRING_FIELD(language); /*! Language requested for voice prompts */
AST_STRING_FIELD(musicclass); /*! Default music class */
AST_STRING_FIELD(accountcode); /*! Account code for billing */
AST_STRING_FIELD(call_forward); /*! Where to forward to if asked to dial on this interface */
);
/*! File descriptor for channel -- Drivers will poll on these file descriptors, so at least one must be non -1. */
int fds[AST_MAX_FDS];
/*! Default music class */
char musicclass[MAX_MUSICCLASS];
/*! Music State*/
void *music_state;
/*! Current generator data if there is any */
@@ -372,14 +372,10 @@ struct ast_channel {
struct ast_pbx *pbx;
/*! Set BEFORE PBX is started to determine AMA flags */
int amaflags;
/*! Account code for billing */
char accountcode[AST_MAX_ACCOUNT_CODE];
/*! Call Detail Record */
struct ast_cdr *cdr;
/*! Whether or not ADSI is detected on CPE */
int adsicpe;
/*! Where to forward to if asked to dial on this interface */
char call_forward[AST_MAX_EXTENSION];
/*! Tone zone as set in indications.conf */
struct tone_zone *zone;