diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-07-25 04:06:32 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-07-25 04:06:32 +0000 |
| commit | cafc1158961f28ad54ebcdc5e042bf8094cbc620 (patch) | |
| tree | 2e54d30ea5d8db7e007ff5c653c5acd4ed3fb649 /channels/chan_skinny.c | |
| parent | 9d8a5ceb02f6559940bd94aaf163a544ce6e6f4c (diff) | |
A great big renaming patch
This patch renames the bridging* files to bridge*. This may seem pedantic
and silly, but it fits better in line with current Asterisk naming conventions:
* channel is not "channeling"
* monitor is not "monitoring"
etc.
A bridge is an object. It is a first class citizen in Asterisk. "Bridging" is
the act of using a bridge on a set of channels - and the API that fulfills that
role is more than just the action.
(closes issue ASTERISK-22130)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_skinny.c')
| -rw-r--r-- | channels/chan_skinny.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 9bcec1b7d..c7485470a 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -81,7 +81,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/indications.h" #include "asterisk/linkedlists.h" #include "asterisk/stasis_endpoints.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" /*** DOCUMENTATION <manager name="SKINNYdevices" language="en_US"> @@ -2872,7 +2872,7 @@ static void _transmit_displayprinotifyvar(struct skinny_device *d, const char *t SKINNY_DEBUG(DEBUG_PACKET, 3, "Transmitting DISPLAY_PRINOTIFY_MESSAGE_VARIABLE to %s, '%s', timeout=%d, priority=%d\n", d->name, text, timeout, priority); } - + req->len = (packetlen & ~0x3) + 4; transmit_response(d, req); @@ -6047,7 +6047,7 @@ static void dialandactivatesub(struct skinny_subchannel *sub, char exten[AST_MAX { struct skinny_line *l = sub->line; struct skinny_device *d = l->device; - + if (sub->dialType == DIALTYPE_NORMAL) { SKINNY_DEBUG(DEBUG_SUB, 3, "Sub %d - Dial %s and Activate\n", sub->callid, exten); ast_copy_string(sub->exten, exten, sizeof(sub->exten)); @@ -7803,7 +7803,7 @@ static void config_parse_variables(int type, void *item, struct ast_variable *vp } else if (!strcasecmp(v->name, "disallow")) { ast_parse_allow_disallow(&default_prefs, default_cap, v->value, 0); continue; - } + } } if (!strcasecmp(v->name, "transfer")) { @@ -8384,7 +8384,7 @@ static int config_load(void) memset(&default_prefs, 0, sizeof(default_prefs)); immed_dialchar = '\0'; memset(&vmexten, '\0', sizeof(vmexten)); - + /* Copy the default jb config over global_jbconf */ memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf)); |