diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-08-09 01:59:59 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-08-09 01:59:59 +0000 |
| commit | e915d19e2feb107878a566f88f99f023b82b90f6 (patch) | |
| tree | fe65734fb55f7f0e65a4e554aa801939b67b4b80 /channels/chan_vpb.c | |
| parent | 53fb7866aba8a5605080dc284ac036f245352fb6 (diff) | |
bridging code cleanups:
code style, formatting
use enum/symbolic constants for return codes
efficiency improvements
(zaptel) only disable DTMF detection once per bridge, not every frame
(zaptel) ensure VPM DTMF detector is turned off during native bridge
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6312 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_vpb.c')
| -rwxr-xr-x | channels/chan_vpb.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c index 6289629eb..be6004992 100755 --- a/channels/chan_vpb.c +++ b/channels/chan_vpb.c @@ -326,7 +326,7 @@ static int vpb_hangup(struct ast_channel *ast); static int vpb_answer(struct ast_channel *ast); static struct ast_frame *vpb_read(struct ast_channel *ast); static int vpb_write(struct ast_channel *ast, struct ast_frame *frame); -static int vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc); +static enum ast_bridge_result vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc); static int vpb_indicate(struct ast_channel *ast, int condition); static int vpb_fixup(struct ast_channel *oldchan, struct ast_channel *newchan); @@ -396,11 +396,12 @@ static struct ast_channel_tech vpb_tech_indicate = { /* #define HALF_DUPLEX_BRIDGE */ /* This is the Native bridge code, which Asterisk will try before using its own bridging code */ -static int vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc) +static enum ast_bridge_result vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc) { struct vpb_pvt *p0 = (struct vpb_pvt *)c0->tech_pvt; struct vpb_pvt *p1 = (struct vpb_pvt *)c1->tech_pvt; - int i, res; + int i; + enum ast_bridge_result res; struct ast_channel *cs[3]; struct ast_channel *who; @@ -412,10 +413,10 @@ static int vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, #ifdef BAD_V4PCI_BRIDGE if(p0->vpb_model==vpb_model_v4pci) - return -2; + return AST_BRIDGE_FAILED_NOWARN; #endif if ( UseNativeBridge != 1){ - return -2; + return AST_BRIDGE_FAILED_NOWARN; } /* @@ -444,7 +445,7 @@ static int vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, ast_log(LOG_WARNING, "%s: vpb_bridge: Failed to bridge %s and %s!\n", p0->dev, c0->name, c1->name); ast_mutex_unlock(&p0->lock); ast_mutex_unlock(&p1->lock); - return -2; + return AST_BRIDGE_FAILED_NOWARN; } else { /* Set bridge pointers. You don't want to take these locks while holding bridge lock.*/ ast_mutex_lock(&p0->lock); { @@ -581,7 +582,7 @@ static int vpb_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, ast_mutex_unlock(&p0->lock); ast_mutex_unlock(&p1->lock); */ - return (res==VPB_OK)?0:-1; + return (res==VPB_OK) ? AST_BRIDGE_COMPLETE : AST_BRIDGE_FAILED; } /* Caller ID can be located in different positions between the rings depending on your Telco |