diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-15 16:18:07 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-15 16:18:07 +0000 |
| commit | af4391bc422e9398901fe1e5ccb2050cb0ba2a1e (patch) | |
| tree | 3ea40481af574573755093830e8653f481fa64b9 | |
| parent | 239100fa1c2ac82026f6056d7e81912016913f44 (diff) | |
Merged revisions 218586 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r218586 | mnicholson | 2009-09-15 11:15:02 -0500 (Tue, 15 Sep 2009) | 15 lines
Merged revisions 218578 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r218578 | mnicholson | 2009-09-15 11:03:54 -0500 (Tue, 15 Sep 2009) | 8 lines
Send request contact header field with response to registrer queries instead of the address of record.
(closes issue #14438)
Reported by: ravindrad
Patches:
regquerypatch uploaded by ravindrad (license 684)
Tested by: ravindrad
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@218590 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 8547efb10..f80174255 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -8992,7 +8992,7 @@ static int respprep(struct sip_request *resp, struct sip_pvt *p, const char *msg add_header(resp, "Expires", tmp); if (p->expiry) { /* Only add contact if we have an expiry time */ char contact[SIPBUFSIZE]; - snprintf(contact, sizeof(contact), "%s;expires=%d", p->our_contact, p->expiry); + snprintf(contact, sizeof(contact), "%s;expires=%d", (p->method == SIP_SUBSCRIBE ? p->our_contact : p->fullcontact), p->expiry); add_header(resp, "Contact", contact); /* Not when we unregister */ } } else if (!ast_strlen_zero(p->our_contact) && resp_needs_contact(msg, p->method)) { @@ -12588,11 +12588,13 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct sockaddr res = 0; break; case PARSE_REGISTER_QUERY: + ast_string_field_set(p, fullcontact, peer->fullcontact); transmit_response_with_date(p, "200 OK", req); peer->lastmsgssent = -1; res = 0; break; case PARSE_REGISTER_UPDATE: + ast_string_field_set(p, fullcontact, peer->fullcontact); update_peer(peer, p->expiry); /* Say OK and ask subsystem to retransmit msg counter */ transmit_response_with_date(p, "200 OK", req); @@ -12625,11 +12627,13 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct sockaddr res = 0; break; case PARSE_REGISTER_QUERY: + ast_string_field_set(p, fullcontact, peer->fullcontact); transmit_response_with_date(p, "200 OK", req); peer->lastmsgssent = -1; res = 0; break; case PARSE_REGISTER_UPDATE: + ast_string_field_set(p, fullcontact, peer->fullcontact); /* Say OK and ask subsystem to retransmit msg counter */ transmit_response_with_date(p, "200 OK", req); manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: SIP\r\nPeer: SIP/%s\r\nPeerStatus: Registered\r\nAddress: %s\r\nPort: %d\r\n", peer->name, ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port)); |