diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 2 | ||||
| -rw-r--r-- | include/asterisk/manager.h | 8 | ||||
| -rw-r--r-- | include/asterisk/pbx.h | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 6a4ff373f..11fb0a7d0 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -469,6 +469,7 @@ struct chanmon; oh.priority = priority; \ oh.cid_num = cid_num; \ oh.cid_name = cid_name; \ + oh.account = account; \ oh.vars = vars; \ oh.parent_channel = NULL; \ } @@ -479,6 +480,7 @@ struct outgoing_helper { int priority; const char *cid_num; const char *cid_name; + const char *account; struct ast_variable *vars; struct ast_channel *parent_channel; }; diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h index 614eeff45..dc1e30063 100644 --- a/include/asterisk/manager.h +++ b/include/asterisk/manager.h @@ -56,8 +56,8 @@ #define EVENT_FLAG_USER (1 << 6) /* Ability to read/set user info */ /* Export manager structures */ -#define MAX_HEADERS 80 -#define MAX_LEN 256 +#define AST_MAX_MANHEADERS 80 +#define AST_MAX_MANHEADER_LEN 256 struct eventqent { struct eventqent *next; @@ -88,7 +88,7 @@ struct mansession { /*! Authorization for writing */ int writeperm; /*! Buffer */ - char inbuf[MAX_LEN]; + char inbuf[AST_MAX_MANHEADER_LEN]; int inlen; int send_events; /* Queued events that we've not had the ability to send yet */ @@ -101,7 +101,7 @@ struct mansession { struct message { int hdrcount; - char headers[MAX_HEADERS][MAX_LEN]; + char headers[AST_MAX_MANHEADERS][AST_MAX_MANHEADER_LEN]; }; struct manager_action { diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index a10546174..d2902002c 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -563,11 +563,11 @@ int ast_async_goto_by_name(const char *chan, const char *context, const char *ex /* Synchronously or asynchronously make an outbound call and send it to a particular extension */ -int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout, const char *context, const char *exten, int priority, int *reason, int sync, const char *cid_num, const char *cid_name, struct ast_variable *vars, struct ast_channel **locked_channel); +int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout, const char *context, const char *exten, int priority, int *reason, int sync, const char *cid_num, const char *cid_name, struct ast_variable *vars, const char *account, struct ast_channel **locked_channel); /* Synchronously or asynchronously make an outbound call and send it to a particular application with given extension */ -int ast_pbx_outgoing_app(const char *type, int format, void *data, int timeout, const char *app, const char *appdata, int *reason, int sync, const char *cid_num, const char *cid_name, struct ast_variable *vars, struct ast_channel **locked_channel); +int ast_pbx_outgoing_app(const char *type, int format, void *data, int timeout, const char *app, const char *appdata, int *reason, int sync, const char *cid_num, const char *cid_name, struct ast_variable *vars, const char *account, struct ast_channel **locked_channel); /* Functions for returning values from structures */ const char *ast_get_context_name(struct ast_context *con); |