sysmocom/asterisk
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mar mar 18 19:11:37 CET 2003

Browse source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@654 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matteo Brancaleoni 2003-03-18 18:11:43 +00:00
parent 72ee4c5781
commit 4b77904dbe
1 changed files with 43 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
channels/chan_sip.c
View file

@ -407,8 +407,13 @@ static int create_addr(struct sip_pvt *r, char *peer)
r->insecure = p->insecure; r->insecure = p->insecure;
r->canreinvite = p->canreinvite; r->canreinvite = p->canreinvite;
r->maxtime = p->maxms; r->maxtime = p->maxms;
if (p->dtmfmode) if (p->dtmfmode) {
r->dtmfmode = p->dtmfmode; r->dtmfmode = p->dtmfmode;
if (r->dtmfmode & SIP_DTMF_RFC2833)
r->nonCodecCapability |= AST_RTP_DTMF;
else
r->nonCodecCapability &= ~AST_RTP_DTMF;
}
strncpy(r->context, p->context,sizeof(r->context)-1); strncpy(r->context, p->context,sizeof(r->context)-1);
if ((p->addr.sin_addr.s_addr || p->defaddr.sin_addr.s_addr) && if ((p->addr.sin_addr.s_addr || p->defaddr.sin_addr.s_addr) &&
(!p->maxms || ((p->lastms > 0) && (p->lastms <= p->maxms)))) { (!p->maxms || ((p->lastms > 0) && (p->lastms <= p->maxms)))) {
@ -1184,6 +1189,8 @@ static struct sip_pvt *sip_alloc(char *callid, struct sockaddr_in *sin, int useg
/* Assume reinvite OK */ /* Assume reinvite OK */
p->canreinvite = 1; p->canreinvite = 1;
p->dtmfmode = globaldtmfmode; p->dtmfmode = globaldtmfmode;
if (p->dtmfmode & SIP_DTMF_RFC2833)
p->nonCodecCapability |= AST_RTP_DTMF;
/* Add to list */ /* Add to list */
ast_pthread_mutex_lock(&iflock); ast_pthread_mutex_lock(&iflock);
p->next = iflist; p->next = iflist;
@ -2625,6 +2632,7 @@ static int check_via(struct sip_pvt *p, struct sip_request *req)
static int check_user(struct sip_pvt *p, struct sip_request *req, char *cmd, char *uri) static int check_user(struct sip_pvt *p, struct sip_request *req, char *cmd, char *uri)
{ {
struct sip_user *user; struct sip_user *user;
struct sip_peer *peer;
char *of, from[256] = "", *c; char *of, from[256] = "", *c;
int res = 0; int res = 0;
char *t; char *t;
@ -2665,14 +2673,46 @@ static int check_user(struct sip_pvt *p, struct sip_request *req, char *cmd, cha
strncpy(p->accountcode, user->accountcode, sizeof(p->accountcode) -1); strncpy(p->accountcode, user->accountcode, sizeof(p->accountcode) -1);
p->canreinvite = user->canreinvite; p->canreinvite = user->canreinvite;
p->amaflags = user->amaflags; p->amaflags = user->amaflags;
if (user->dtmfmode) if (user->dtmfmode) {
p->dtmfmode = user->dtmfmode; p->dtmfmode = user->dtmfmode;
if (p->dtmfmode & SIP_DTMF_RFC2833)
p->nonCodecCapability |= AST_RTP_DTMF;
else
p->nonCodecCapability &= ~AST_RTP_DTMF;
}
} }
break; break;
} }
user = user->next; user = user->next;
} }
ast_pthread_mutex_unlock(&userl.lock); ast_pthread_mutex_unlock(&userl.lock);
if (!user) {
/* If we didn't find a user match, check for peers */
ast_pthread_mutex_lock(&peerl.lock);
peer = peerl.peers;
while(peer) {
if (!memcmp(&peer->addr, &p->recv, sizeof(peer->addr))) {
/* Take the peer */
p->nat = peer->nat;
if (p->rtp) {
ast_log(LOG_DEBUG, "Setting NAT on RTP to %d\n", p->nat);
ast_rtp_setnat(p->rtp, p->nat);
}
p->canreinvite = peer->canreinvite;
strncpy(p->username, peer->name, sizeof(p->username) - 1);
if (peer->dtmfmode) {
p->dtmfmode = peer->dtmfmode;
if (p->dtmfmode & SIP_DTMF_RFC2833)
p->nonCodecCapability |= AST_RTP_DTMF;
else
p->nonCodecCapability &= ~AST_RTP_DTMF;
}
break;
}
peer = peer->next;
}
ast_pthread_mutex_unlock(&peerl.lock);
}
return res; return res;
} }
@ -3431,7 +3471,7 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc
} }
} }
if (strcmp(cmd, "SIP/2.0")) if (strcmp(cmd, "SIP/2.0") && (seqno >= p->icseq))
/* Next should follow monotonically increasing */ /* Next should follow monotonically increasing */
p->icseq = seqno + 1; p->icseq = seqno + 1;