diff options
| author | Matteo Brancaleoni <mbrancaleoni@espia.it> | 2003-02-13 06:00:14 +0000 |
|---|---|---|
| committer | Matteo Brancaleoni <mbrancaleoni@espia.it> | 2003-02-13 06:00:14 +0000 |
| commit | 52a7b81e248f05d6c1e87d2d9260f04632e3b3d7 (patch) | |
| tree | 6de335942589dc50bacb98f3c1119222c6cb97d5 /channels | |
| parent | 2bd936105e72e2dcc1f847a28f04b2538e83020f (diff) | |
Thu Feb 13 07:00:00 CET 2003
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@613 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_sip.c | 12 | ||||
| -rwxr-xr-x | channels/chan_zap.c | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 9818b2788..93d877734 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -797,7 +797,7 @@ static int sip_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, return -1; } -static struct ast_channel *sip_new(struct sip_pvt *i, int state) +static struct ast_channel *sip_new(struct sip_pvt *i, int state, char *title) { struct ast_channel *tmp; int fmt; @@ -807,7 +807,10 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state) if (!tmp->nativeformats) tmp->nativeformats = capability; fmt = ast_best_codec(tmp->nativeformats); - snprintf(tmp->name, sizeof(tmp->name), "SIP/%s:%d", inet_ntoa(i->sa.sin_addr), ntohs(i->sa.sin_port)); + if (title) + snprintf(tmp->name, sizeof(tmp->name), "SIP/%s", title); + else + snprintf(tmp->name, sizeof(tmp->name), "SIP/%s:%d", inet_ntoa(i->sa.sin_addr), ntohs(i->sa.sin_port)); tmp->type = type; tmp->fds[0] = ast_rtp_fd(i->rtp); ast_setstate(tmp, state); @@ -2256,6 +2259,7 @@ static int check_user(struct sip_pvt *p, struct sip_request *req, char *cmd, cha strncpy(p->context, user->context, sizeof(p->context) - 1); if (strlen(user->callerid) && strlen(p->callerid)) strncpy(p->callerid, user->callerid, sizeof(p->callerid) - 1); + strncpy(p->username, user->name, sizeof(p->username) - 1); strncpy(p->accountcode, user->accountcode, sizeof(p->accountcode) -1); p->canreinvite = user->canreinvite; p->amaflags = user->amaflags; @@ -2992,7 +2996,7 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc /* Initialize tag */ p->tag = rand(); /* First invitation */ - c = sip_new(p, AST_STATE_DOWN); + c = sip_new(p, AST_STATE_DOWN, strlen(p->username) ? p->username : NULL); } } else @@ -3388,7 +3392,7 @@ static struct ast_channel *sip_request(char *type, int format, void *data) #if 0 printf("Setting up to call extension '%s' at '%s'\n", ext ? ext : "<none>", host); #endif - tmpc = sip_new(p, AST_STATE_DOWN); + tmpc = sip_new(p, AST_STATE_DOWN, host); if (!tmpc) sip_destroy(p); restart_monitor(); diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 5244bbe68..45f6aed81 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -3560,6 +3560,10 @@ static void *ss_thread(void *data) case SIG_FXOKS: /* Read the first digit */ timeout = firstdigittimeout; + /* If starting a threeway call, never timeout on the first digit so someone + can use flash-hook as a "hold" feature */ + if (p->subs[SUB_THREEWAY].owner) + timeout = 999999; while(len < AST_MAX_EXTENSION-1) { res = ast_waitfordigit(chan, timeout); timeout = 0; @@ -3570,7 +3574,7 @@ static void *ss_thread(void *data) return NULL; } else if (res) { exten[len++]=res; - exten[len] = '\0'; + exten[len] = '\0'; } if (!ast_ignore_pattern(chan->context, exten)) tone_zone_play_tone(p->subs[index].zfd, -1); |