[Asterisk-cvs] asterisk/channels chan_alsa.c,1.22,1.23 chan_iax2.c,1.160,1.161
markster at lists.digium.com
markster at lists.digium.com
Sat Jun 26 12:02:37 CDT 2004
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv18097/channels
Modified Files:
chan_alsa.c chan_iax2.c
Log Message:
Add peercontext parameter for default outbound context (bug #1929)
Index: chan_alsa.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_alsa.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- chan_alsa.c 26 Jun 2004 14:19:38 -0000 1.22
+++ chan_alsa.c 26 Jun 2004 15:48:30 -0000 1.23
@@ -647,6 +647,7 @@
left = FRAME_SIZE;
if (chan->_state != AST_STATE_UP) {
/* Don't transmit unless it's up */
+ ast_mutex_unlock(&alsalock);
return &f;
}
f.frametype = AST_FRAME_VOICE;
Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- chan_iax2.c 26 Jun 2004 14:19:38 -0000 1.160
+++ chan_iax2.c 26 Jun 2004 15:48:30 -0000 1.161
@@ -216,6 +216,7 @@
char secret[80];
char outkey[80]; /* What key we use to talk to this peer */
char context[AST_MAX_EXTENSION]; /* Default context (for transfer really) */
+ char peercontext[AST_MAX_EXTENSION]; /* Context to pass to peer */
char mailbox[AST_MAX_EXTENSION]; /* Mailbox */
struct sockaddr_in addr;
int formats;
@@ -1960,7 +1961,7 @@
}
#endif /* MYSQL_FRIENDS */
-static int create_addr(struct sockaddr_in *sin, int *capability, int *sendani, int *maxtime, char *peer, char *context, int *trunk, int *notransfer, char *secret, int seclen, int *ofound)
+static int create_addr(struct sockaddr_in *sin, int *capability, int *sendani, int *maxtime, char *peer, char *context, int *trunk, int *notransfer, char *secret, int seclen, int *ofound, char *peercontext)
{
struct ast_hostent ahp; struct hostent *hp;
struct iax2_peer *p;
@@ -1995,6 +1996,8 @@
*maxtime = p->maxms; /* Max time they should take */
if (context)
strncpy(context, p->context, AST_MAX_EXTENSION - 1);
+ if (peercontext)
+ strncpy(peercontext, p->peercontext, AST_MAX_EXTENSION - 1);
if (trunk)
*trunk = p->trunk;
if (capability)
@@ -2079,6 +2082,7 @@
struct iax_ie_data ied;
char myrdest [5] = "s";
char context[AST_MAX_EXTENSION] ="";
+ char peercontext[AST_MAX_EXTENSION] ="";
char *portno = NULL;
char *opts = "";
unsigned short callno = PTR_TO_CALLNO(c->pvt->pvt);
@@ -2125,7 +2129,7 @@
strsep(&stringp, ":");
portno = strsep(&stringp, ":");
}
- if (create_addr(&sin, NULL, NULL, NULL, hname, context, NULL, NULL, storedsecret, sizeof(storedsecret) - 1, NULL)) {
+ if (create_addr(&sin, NULL, NULL, NULL, hname, context, NULL, NULL, storedsecret, sizeof(storedsecret) - 1, NULL, peercontext)) {
ast_log(LOG_WARNING, "No address associated with '%s'\n", hname);
return -1;
}
@@ -2168,6 +2172,8 @@
iax_ie_append_str(&ied, IAX_IE_DNID, c->dnid);
if (rcontext)
iax_ie_append_str(&ied, IAX_IE_CALLED_CONTEXT, rcontext);
+ else if (strlen(peercontext))
+ iax_ie_append_str(&ied, IAX_IE_CALLED_CONTEXT, peercontext);
if (username)
iax_ie_append_str(&ied, IAX_IE_USERNAME, username);
if (!secret && !ast_strlen_zero(storedsecret))
@@ -5785,7 +5791,7 @@
}
/* Populate our address from the given */
- if (create_addr(&sin, &capability, &sendani, &maxtime, hostname, NULL, &trunk, ¬ransfer, NULL, 0, &found)) {
+ if (create_addr(&sin, &capability, &sendani, &maxtime, hostname, NULL, &trunk, ¬ransfer, NULL, 0, &found, NULL)) {
return NULL;
}
if (portno) {
@@ -6012,6 +6018,9 @@
} else if (!strcasecmp(v->name, "context")) {
if (ast_strlen_zero(peer->context))
strncpy(peer->context, v->value, sizeof(peer->context) - 1);
+ } else if (!strcasecmp(v->name, "peercontext")) {
+ if (ast_strlen_zero(peer->peercontext))
+ strncpy(peer->peercontext, v->value, sizeof(peer->peercontext) - 1);
} else if (!strcasecmp(v->name, "port")) {
if (peer->dynamic)
peer->defaddr.sin_port = htons(atoi(v->value));
@@ -6553,7 +6562,7 @@
host = st;
}
/* Populate our address from the given */
- if (create_addr(&sin, NULL, NULL, NULL, host, NULL, NULL, NULL, NULL, 0, NULL)) {
+ if (create_addr(&sin, NULL, NULL, NULL, host, NULL, NULL, NULL, NULL, 0, NULL, NULL)) {
return -1;
}
ast_log(LOG_DEBUG, "host: %s, user: %s, password: %s, context: %s\n", host, username, password, context);
More information about the svn-commits
mailing list