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

Search for the subaddress only within the extension section of the dial string.

Browse Source 
Dial(DAHDI/(g|G|r|R)<group#(0-63)>[c|r<cadance#>|d][/extension])


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2009-10-22 20:07:55 +00:00
parent 776a14386a
commit 63473616da
1 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
channels/sig_pri.c
View File

@@ -2718,7 +2718,7 @@ int sig_pri_call(struct sig_pri_chan *p, struct ast_channel *ast, char *rdest, i
char dest[256]; /* must be same length as p->dialdest */ char dest[256]; /* must be same length as p->dialdest */
struct ast_party_subaddress dialed_subaddress; /* Called subaddress */ struct ast_party_subaddress dialed_subaddress; /* Called subaddress */
struct pri_sr *sr; struct pri_sr *sr;
char *c, *l, *n, *s = NULL; char *c, *l, *n, *s;
#ifdef SUPPORT_USERUSER #ifdef SUPPORT_USERUSER
const char *useruser; const char *useruser;
#endif #endif
@@ -2745,34 +2745,6 @@ int sig_pri_call(struct sig_pri_chan *p, struct ast_channel *ast, char *rdest, i
p->dialdest[0] = '\0'; p->dialdest[0] = '\0';
p->outgoing = 1; p->outgoing = 1;
/* setup dialed_subaddress if found */
ast_party_subaddress_init(&dialed_subaddress);
c = strrchr(dest, ':');
if (c) {
*c = '\0';
c++;
/* prefix */
/* 'n' = NSAP */
/* 'U' = odd, 'u'= even */
/* Default = NSAP */
switch (*c) {
case 'U':
dialed_subaddress.odd_even_indicator = 1;
/* fall through */
case 'u':
c++;
dialed_subaddress.type = 2;
break;
case 'N':
case 'n':
c++;
/* default already covered with ast_party_subaddress_init */
break;
}
dialed_subaddress.str = c;
dialed_subaddress.valid = 1;
}
c = strchr(dest, '/'); c = strchr(dest, '/');
if (c) { if (c) {
c++; c++;
@@ -2780,6 +2752,35 @@ int sig_pri_call(struct sig_pri_chan *p, struct ast_channel *ast, char *rdest, i
c = ""; c = "";
} }
/* setup dialed_subaddress if found */
ast_party_subaddress_init(&dialed_subaddress);
s = strchr(c, ':');
if (s) {
*s = '\0';
s++;
/* prefix */
/* 'n' = NSAP */
/* 'U' = odd, 'u'= even */
/* Default = NSAP */
switch (*s) {
case 'U':
dialed_subaddress.odd_even_indicator = 1;
/* fall through */
case 'u':
s++;
dialed_subaddress.type = 2;
break;
case 'N':
case 'n':
s++;
/* default already covered with ast_party_subaddress_init */
break;
}
dialed_subaddress.str = s;
dialed_subaddress.valid = 1;
s = NULL;
}
l = NULL; l = NULL;
n = NULL; n = NULL;
if (!p->hidecallerid) { if (!p->hidecallerid) {