kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable reinvite via "UPDATE" if selected

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@712 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-03-28 06:59:34 +00:00
parent 488cdb8ef7
commit 2f35e7462e
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
channels/chan_sip.c
View File

@@ -300,6 +300,9 @@ struct sip_registry {
struct sip_registry *next; struct sip_registry *next;
}; };
#define REINVITE_INVITE 1
#define REINVITE_UPDATE 2
static int sip_do_register(struct sip_registry *r); static int sip_do_register(struct sip_registry *r);
struct sip_registry *registrations; struct sip_registry *registrations;
@@ -1235,8 +1238,8 @@ static struct sip_pvt *sip_alloc(char *callid, struct sockaddr_in *sin, int useg
build_callid(p->callid, sizeof(p->callid), p->ourip); build_callid(p->callid, sizeof(p->callid), p->ourip);
else else
strncpy(p->callid, callid, sizeof(p->callid) - 1); strncpy(p->callid, callid, sizeof(p->callid) - 1);
/* Assume reinvite OK */ /* Assume reinvite OK and via INVITE */
p->canreinvite = 1; p->canreinvite = REINVITE_INVITE;
p->dtmfmode = globaldtmfmode; p->dtmfmode = globaldtmfmode;
if (p->dtmfmode & SIP_DTMF_RFC2833) if (p->dtmfmode & SIP_DTMF_RFC2833)
p->noncodeccapability |= AST_RTP_DTMF; p->noncodeccapability |= AST_RTP_DTMF;
@@ -2006,6 +2009,9 @@ static int transmit_response_with_sdp(struct sip_pvt *p, char *msg, struct sip_r
static int transmit_reinvite_with_sdp(struct sip_pvt *p, struct ast_rtp *rtp) static int transmit_reinvite_with_sdp(struct sip_pvt *p, struct ast_rtp *rtp)
{ {
struct sip_request resp; struct sip_request resp;
if (p->canreinvite == REINVITE_UPDATE)
reqprep(&resp, p, "UPDATE", 1);
else
reqprep(&resp, p, "INVITE", 1); reqprep(&resp, p, "INVITE", 1);
add_sdp(&resp, p, rtp); add_sdp(&resp, p, rtp);
return send_request(p, &resp, 1, p->ocseq); return send_request(p, &resp, 1, p->ocseq);
@@ -4034,7 +4040,7 @@ static struct sip_user *build_user(char *name, struct ast_variable *v)
if (user) { if (user) {
memset(user, 0, sizeof(struct sip_user)); memset(user, 0, sizeof(struct sip_user));
strncpy(user->name, name, sizeof(user->name)-1); strncpy(user->name, name, sizeof(user->name)-1);
user->canreinvite = 1; user->canreinvite = REINVITE_INVITE;
/* JK02: set default context */ /* JK02: set default context */
strcpy(user->context, context); strcpy(user->context, context);
while(v) { while(v) {
@@ -4059,6 +4065,9 @@ static struct sip_user *build_user(char *name, struct ast_variable *v)
user->dtmfmode = SIP_DTMF_RFC2833; user->dtmfmode = SIP_DTMF_RFC2833;
} }
} else if (!strcasecmp(v->name, "canreinvite")) { } else if (!strcasecmp(v->name, "canreinvite")) {
if (!strcasecmp(v->value, "update"))
user->canreinvite = REINVITE_UPDATE;
else
user->canreinvite = ast_true(v->value); user->canreinvite = ast_true(v->value);
} else if (!strcasecmp(v->name, "nat")) { } else if (!strcasecmp(v->name, "nat")) {
user->nat = ast_true(v->value); user->nat = ast_true(v->value);
@@ -4131,16 +4140,19 @@ static struct sip_peer *build_peer(char *name, struct ast_variable *v)
} }
peer->capability = capability; peer->capability = capability;
/* Assume can reinvite */ /* Assume can reinvite */
peer->canreinvite = 1; peer->canreinvite = REINVITE_INVITE;
peer->dtmfmode = 0; peer->dtmfmode = 0;
while(v) { while(v) {
if (!strcasecmp(v->name, "secret")) if (!strcasecmp(v->name, "secret"))
strncpy(peer->secret, v->value, sizeof(peer->secret)-1); strncpy(peer->secret, v->value, sizeof(peer->secret)-1);
else if (!strcasecmp(v->name, "auth")) else if (!strcasecmp(v->name, "auth"))
strncpy(peer->methods, v->value, sizeof(peer->methods)-1); strncpy(peer->methods, v->value, sizeof(peer->methods)-1);
else if (!strcasecmp(v->name, "canreinvite")) else if (!strcasecmp(v->name, "canreinvite")) {
if (!strcasecmp(v->value, "update"))
peer->canreinvite = REINVITE_UPDATE;
else
peer->canreinvite = ast_true(v->value); peer->canreinvite = ast_true(v->value);
else if (!strcasecmp(v->name, "nat")) } else if (!strcasecmp(v->name, "nat"))
peer->nat = ast_true(v->value); peer->nat = ast_true(v->value);
else if (!strcasecmp(v->name, "context")) else if (!strcasecmp(v->name, "context"))
strncpy(peer->context, v->value, sizeof(peer->context)-1); strncpy(peer->context, v->value, sizeof(peer->context)-1);