kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 12:52:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@28831 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-19 20:06:50 +00:00
parent 134eb7c8f6
commit 3e6f1fe864
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_sip.c
View File

@@ -10933,13 +10933,17 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
} }
return 0; return 0;
} }
/* Initialize the context if it hasn't been already */ gotdest = get_destination(p, NULL);
/* Initialize the context if it hasn't been already;
note this is done _after_ handling any domain lookups,
because the context specified there is for calls, not
subscriptions
*/
if (!ast_strlen_zero(p->subscribecontext)) if (!ast_strlen_zero(p->subscribecontext))
ast_copy_string(p->context, p->subscribecontext, sizeof(p->context)); ast_copy_string(p->context, p->subscribecontext, sizeof(p->context));
else if (ast_strlen_zero(p->context)) else if (ast_strlen_zero(p->context))
strcpy(p->context, default_context); strcpy(p->context, default_context);
/* Get destination right away */ /* Get destination right away */
gotdest = get_destination(p, NULL);
build_contact(p); build_contact(p);
if (gotdest) { if (gotdest) {
if (gotdest < 0) if (gotdest < 0)

4
utils/smsq.c
View File

@@ -142,7 +142,7 @@ static char txqcheck (char *dir, char *queue, char subaddress, char *channel, ch
p = channel; p = channel;
p = strchr (p, 'X'); p = strchr (p, 'X');
if (p) if (p)
fprintf (f, "%.*s%c%s\n", p - channel, channel, subaddress, p + 1); fprintf (f, "%.*s%c%s\n", (int)(p - channel), channel, subaddress, p + 1);
else else
fprintf (f, "%s\n", channel); fprintf (f, "%s\n", channel);
} }
@@ -153,7 +153,7 @@ static char txqcheck (char *dir, char *queue, char subaddress, char *channel, ch
{ {
p = strchr (callerid, 'X'); p = strchr (callerid, 'X');
if (p) if (p)
fprintf (f, "%.*s%c%s", p - callerid, callerid, subaddress, p + 1); fprintf (f, "%.*s%c%s", (int)(p - callerid), callerid, subaddress, p + 1);
else else
fprintf (f, "%s", callerid); fprintf (f, "%s", callerid);
} }