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

When we receive a full frame that is supposed to contain our call number,

Browse Source 
ensure that it has the correct one.
(closes issue #10078)
(AST-2008-006)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@114561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-04-22 22:20:35 +00:00
parent 8f7422b931
commit 38419fb811
1 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
channels/chan_iax2.c
View File

@@ -967,13 +967,13 @@ static struct iax_frame *iaxfrdup2(struct iax_frame *fr)
#define NEW_ALLOW 1 #define NEW_ALLOW 1
#define NEW_FORCE 2 #define NEW_FORCE 2
static int match(struct sockaddr_in *sin, unsigned short callno, unsigned short dcallno, struct chan_iax2_pvt *cur) static int match(struct sockaddr_in *sin, unsigned short callno, unsigned short dcallno, struct chan_iax2_pvt *cur, int full_frame)
{ {
if ((cur->addr.sin_addr.s_addr == sin->sin_addr.s_addr) && if ((cur->addr.sin_addr.s_addr == sin->sin_addr.s_addr) &&
(cur->addr.sin_port == sin->sin_port)) { (cur->addr.sin_port == sin->sin_port)) {
/* This is the main host */ /* This is the main host */
if ((cur->peercallno == callno) || if ( (cur->peercallno == 0 || cur->peercallno == callno) &&
((dcallno == cur->callno) && !cur->peercallno)) { (full_frame ? dcallno == cur->callno : 1) ) {
/* That's us. Be sure we keep track of the peer call number */ /* That's us. Be sure we keep track of the peer call number */
return 1; return 1;
} }
@@ -1062,7 +1062,7 @@ static int make_trunk(unsigned short callno, int locked)
return res; return res;
} }
static int find_callno(unsigned short callno, unsigned short dcallno, struct sockaddr_in *sin, int new, int lockpeer, int sockfd) static int find_callno(unsigned short callno, unsigned short dcallno, struct sockaddr_in *sin, int new, int lockpeer, int sockfd, int full_frame)
{ {
int res = 0; int res = 0;
int x; int x;
@@ -1075,7 +1075,7 @@ static int find_callno(unsigned short callno, unsigned short dcallno, struct soc
ast_mutex_lock(&iaxsl[x]); ast_mutex_lock(&iaxsl[x]);
if (iaxs[x]) { if (iaxs[x]) {
/* Look for an exact match */ /* Look for an exact match */
if (match(sin, callno, dcallno, iaxs[x])) { if (match(sin, callno, dcallno, iaxs[x], full_frame)) {
res = x; res = x;
} }
} }
@@ -1085,7 +1085,7 @@ static int find_callno(unsigned short callno, unsigned short dcallno, struct soc
ast_mutex_lock(&iaxsl[x]); ast_mutex_lock(&iaxsl[x]);
if (iaxs[x]) { if (iaxs[x]) {
/* Look for an exact match */ /* Look for an exact match */
if (match(sin, callno, dcallno, iaxs[x])) { if (match(sin, callno, dcallno, iaxs[x], full_frame)) {
res = x; res = x;
} }
} }
@@ -1093,6 +1093,8 @@ static int find_callno(unsigned short callno, unsigned short dcallno, struct soc
} }
} }
if ((res < 1) && (new >= NEW_ALLOW)) { if ((res < 1) && (new >= NEW_ALLOW)) {
int start, found = 0;
/* It may seem odd that we look through the peer list for a name for /* It may seem odd that we look through the peer list for a name for
* this *incoming* call. Well, it is weird. However, users don't * this *incoming* call. Well, it is weird. However, users don't
* have an IP address/port number that we can match against. So, * have an IP address/port number that we can match against. So,
@@ -1101,15 +1103,30 @@ static int find_callno(unsigned short callno, unsigned short dcallno, struct soc
* correct, but it will be changed if needed after authentication. */ * correct, but it will be changed if needed after authentication. */
if (!iax2_getpeername(*sin, host, sizeof(host), lockpeer)) if (!iax2_getpeername(*sin, host, sizeof(host), lockpeer))
snprintf(host, sizeof(host), "%s:%d", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr), ntohs(sin->sin_port)); snprintf(host, sizeof(host), "%s:%d", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr), ntohs(sin->sin_port));
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
for (x=1;x<TRUNK_CALL_START;x++) {
start = 1 + (rand() % (TRUNK_CALL_START - 1));
for (x = start; 1; x++) {
if (x == TRUNK_CALL_START) {
x = 0;
continue;
}
/* Find first unused call number that hasn't been used in a while */ /* Find first unused call number that hasn't been used in a while */
ast_mutex_lock(&iaxsl[x]); ast_mutex_lock(&iaxsl[x]);
if (!iaxs[x] && ((now.tv_sec - lastused[x].tv_sec) > MIN_REUSE_TIME)) break; if (!iaxs[x] && ((now.tv_sec - lastused[x].tv_sec) > MIN_REUSE_TIME)) {
found = 1;
break;
}
ast_mutex_unlock(&iaxsl[x]); ast_mutex_unlock(&iaxsl[x]);
if (x == start - 1) {
break;
}
} }
/* We've still got lock held if we found a spot */ /* We've still got lock held if we found a spot */
if (x >= TRUNK_CALL_START) { if (x == start - 1 && !found) {
ast_log(LOG_WARNING, "No more space\n"); ast_log(LOG_WARNING, "No more space\n");
return 0; return 0;
} }
@@ -6521,7 +6538,7 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
} }
/* This is a video frame, get call number */ /* This is a video frame, get call number */
fr->callno = find_callno(ntohs(vh->callno) & ~0x8000, dcallno, &sin, new, 1, fd); fr->callno = find_callno(ntohs(vh->callno) & ~0x8000, dcallno, &sin, new, 1, fd, 0);
minivid = 1; minivid = 1;
} else if ((meta->zeros == 0) && !(ntohs(meta->metacmd) & 0x8000)) { } else if ((meta->zeros == 0) && !(ntohs(meta->metacmd) & 0x8000)) {
unsigned char metatype; unsigned char metatype;
@@ -6579,7 +6596,7 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
/* Stop if we don't have enough data */ /* Stop if we don't have enough data */
if (len > res) if (len > res)
break; break;
fr->callno = find_callno(callno & ~IAX_FLAG_FULL, 0, &sin, NEW_PREVENT, 1, fd); fr->callno = find_callno(callno & ~IAX_FLAG_FULL, 0, &sin, NEW_PREVENT, 1, fd, 0);
if (fr->callno) { if (fr->callno) {
ast_mutex_lock(&iaxsl[fr->callno]); ast_mutex_lock(&iaxsl[fr->callno]);
/* If it's a valid call, deliver the contents. If not, we /* If it's a valid call, deliver the contents. If not, we
@@ -6682,7 +6699,7 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
} }
if (!fr->callno) if (!fr->callno)
fr->callno = find_callno(ntohs(mh->callno) & ~IAX_FLAG_FULL, dcallno, &sin, new, 1, fd); fr->callno = find_callno(ntohs(mh->callno) & ~IAX_FLAG_FULL, dcallno, &sin, new, 1, fd, ntohs(mh->callno) & IAX_FLAG_FULL);
if (fr->callno > 0) if (fr->callno > 0)
ast_mutex_lock(&iaxsl[fr->callno]); ast_mutex_lock(&iaxsl[fr->callno]);
@@ -7879,7 +7896,7 @@ static int iax2_do_register(struct iax2_registry *reg)
if (!reg->callno) { if (!reg->callno) {
if (option_debug) if (option_debug)
ast_log(LOG_DEBUG, "Allocate call number\n"); ast_log(LOG_DEBUG, "Allocate call number\n");
reg->callno = find_callno(0, 0, &reg->addr, NEW_FORCE, 1, defaultsockfd); reg->callno = find_callno(0, 0, &reg->addr, NEW_FORCE, 1, defaultsockfd, 0);
if (reg->callno < 1) { if (reg->callno < 1) {
ast_log(LOG_WARNING, "Unable to create call for registration\n"); ast_log(LOG_WARNING, "Unable to create call for registration\n");
return -1; return -1;
@@ -7939,7 +7956,7 @@ static int iax2_provision(struct sockaddr_in *end, int sockfd, char *dest, const
memset(&ied, 0, sizeof(ied)); memset(&ied, 0, sizeof(ied));
iax_ie_append_raw(&ied, IAX_IE_PROVISIONING, provdata.buf, provdata.pos); iax_ie_append_raw(&ied, IAX_IE_PROVISIONING, provdata.buf, provdata.pos);
callno = find_callno(0, 0, &sin, NEW_FORCE, 1, cai.sockfd); callno = find_callno(0, 0, &sin, NEW_FORCE, 1, cai.sockfd, 0);
if (!callno) if (!callno)
return -1; return -1;
@@ -8057,7 +8074,7 @@ static int iax2_poke_peer(struct iax2_peer *peer, int heldcall)
} }
if (heldcall) if (heldcall)
ast_mutex_unlock(&iaxsl[heldcall]); ast_mutex_unlock(&iaxsl[heldcall]);
peer->callno = find_callno(0, 0, &peer->addr, NEW_FORCE, 0, peer->sockfd); peer->callno = find_callno(0, 0, &peer->addr, NEW_FORCE, 0, peer->sockfd, 0);
if (heldcall) if (heldcall)
ast_mutex_lock(&iaxsl[heldcall]); ast_mutex_lock(&iaxsl[heldcall]);
if (peer->callno < 1) { if (peer->callno < 1) {
@@ -8125,7 +8142,7 @@ static struct ast_channel *iax2_request(const char *type, int format, void *data
if (pds.port) if (pds.port)
sin.sin_port = htons(atoi(pds.port)); sin.sin_port = htons(atoi(pds.port));
callno = find_callno(0, 0, &sin, NEW_FORCE, 1, cai.sockfd); callno = find_callno(0, 0, &sin, NEW_FORCE, 1, cai.sockfd, 0);
if (callno < 1) { if (callno < 1) {
ast_log(LOG_WARNING, "Unable to create call\n"); ast_log(LOG_WARNING, "Unable to create call\n");
*cause = AST_CAUSE_CONGESTION; *cause = AST_CAUSE_CONGESTION;
@@ -9216,7 +9233,7 @@ static int cache_get_callno_locked(const char *data)
ast_log(LOG_DEBUG, "peer: %s, username: %s, password: %s, context: %s\n", ast_log(LOG_DEBUG, "peer: %s, username: %s, password: %s, context: %s\n",
pds.peer, pds.username, pds.password, pds.context); pds.peer, pds.username, pds.password, pds.context);
callno = find_callno(0, 0, &sin, NEW_FORCE, 1, cai.sockfd); callno = find_callno(0, 0, &sin, NEW_FORCE, 1, cai.sockfd, 0);
if (callno < 1) { if (callno < 1) {
ast_log(LOG_WARNING, "Unable to create call\n"); ast_log(LOG_WARNING, "Unable to create call\n");
return -1; return -1;