Now the default transport type is only used until the peer registers. When registration takes place the transport type is parsed out of the Contact header. If the Contact header's transport type is equal to one that the peer supports, the peer's default transport type for outbound connections is set to match the Contact header's type. If the Contact header's transport type is not present, then the peer's default transport type is set to match the one the peer registered with.
/* Make sure it's a SIP URL */
- /*! \todo This code assumes that the Contact is using the same transport as the
- REGISTER request. That might not be true at all. You can receive
- sips: requests over any transport. Needs to be fixed.
- Does not parse the ;transport uri parameter at this point, which might be handy
- in some situations.
- */
if (pvt->socket.type == SIP_TRANSPORT_TLS) {
- if (parse_uri(curi, "sips:", &curi, NULL, &host, &pt, NULL)) {
- if (parse_uri(curi2, "sip:", &curi, NULL, &host, &pt, NULL))
+ if (parse_uri(curi, "sips:", &curi, NULL, &host, &pt, NULL, &transport)) {
+ if (parse_uri(curi2, "sip:", &curi, NULL, &host, &pt, NULL, &transport))
ast_log(LOG_NOTICE, "Not a valid SIP contact (missing sip:) trying to use anyway\n");
}
port = !ast_strlen_zero(pt) ? atoi(pt) : STANDARD_TLS_PORT;
} else {
- if (parse_uri(curi, "sip:", &curi, NULL, &host, &pt, NULL))
+ if (parse_uri(curi, "sip:", &curi, NULL, &host, &pt, NULL, &transport))
ast_log(LOG_NOTICE, "Not a valid SIP contact (missing sip:) trying to use anyway\n");
port = !ast_strlen_zero(pt) ? atoi(pt) : STANDARD_SIP_PORT;
+ }
+
+ /* handle the transport type specified in Contact header. */
+ if ((transport_type = get_transport_str2enum(transport))) {
+ /* if the port is not specified but the transport is, make sure to set the
+ * default port to match the specified transport. This may or may not be the
+ * same transport used by the pvt struct for the Register dialog. */
+ if (ast_strlen_zero(pt)) {
+ port = (transport_type == SIP_TRANSPORT_TLS) ? STANDARD_TLS_PORT : STANDARD_SIP_PORT;
+ }
+ } else {
+ transport_type = pvt->socket.type;
+ }
+
+ /* if the peer's socket type is different than the Registration
+ * transport type, change it. If it got this far, it is a
+ * supported type, but check just in case */
+ if ((peer->socket.type != transport_type) && (peer->transports & transport_type)) {
+ peer->socket.type = transport_type;
+ peer->socket.fd = -1;
+ if (peer->socket.tcptls_session) {
+ ao2_ref(peer->socket.tcptls_session, -1);
+ peer->socket.tcptls_session = NULL;
+ }
}
+ /* if the Contact header information copied into peer->addr matches the
+ * received address, and the transport types are the same, then copy socket
+ * data into the peer struct */
+ if ((peer->socket.type == pvt->socket.type) &&
+ (peer->addr.sin_addr.s_addr == pvt->recv.sin_addr.s_addr) &&
+ (peer->addr.sin_port == pvt->recv.sin_port)){
+
+ copy_socket_data(&peer->socket, &pvt->socket);
+ }
+
/* Now that our address has been updated put ourselves back into the container for lookups */
ao2_t_link(peers_by_ip, peer, "ao2_link into peers_by_ip table");
@@ -13618,12 +13677,12 @@
/*! \todo Samme logical error as in many places above. Need a generic function for this.
*/
if (p->socket.type == SIP_TRANSPORT_TLS) {
- if (parse_uri(of, "sips:", &of, &dummy, &domain, &dummy, &dummy)) {
- if (parse_uri(of2, "sip:", &of, &dummy, &domain, &dummy, &dummy))
+ if (parse_uri(of, "sips:", &of, &dummy, &domain, &dummy, &dummy, NULL)) {
+ if (parse_uri(of2, "sip:", &of, &dummy, &domain, &dummy, &dummy, NULL))
ast_log(LOG_NOTICE, "From address missing 'sip:', using it anyway\n");
}
} else {
- if (parse_uri(of, "sip:", &of, &dummy, &domain, &dummy, &dummy))
+ if (parse_uri(of, "sip:", &of, &dummy, &domain, &dummy, &dummy, NULL))
ast_log(LOG_NOTICE, "From address missing 'sip:', using it anyway\n");
}
@@ -23221,9 +23280,10 @@
{
struct sip_peer *peer = NULL;
struct ast_ha *oldha = NULL;
- int found=0;
- int firstpass=1;
- int format=0; /* Ama flags */
+ int found = 0;
+ int firstpass = 1;
+ int format = 0; /* Ama flags */
+ int original_transport = 0;
time_t regseconds = 0;
struct ast_flags peerflags[2] = {{(0)}};
struct ast_flags mask[2] = {{(0)}};
@@ -23286,8 +23346,9 @@
/* If we have realm authentication information, remove them (reload) */
clear_realm_authentication(peer->auth);
peer->auth = NULL;
+ original_transport = peer->socket.type;
+ peer->socket.type = 0;
peer->transports = 0;
- peer->socket.type = 0;
for (; v || ((v = alt) && !(alt=NULL)); v = v->next) {
if (handle_common_options(&peerflags[0], &mask[0], v))
@@ -23310,7 +23371,6 @@
if (!peer->socket.type) { /*!< The first transport listed should be used for outgoing */
peer->socket.type = peer->transports;
- peer->socket.fd = -1;
}
}
} else if (realtime && !strcasecmp(v->name, "regseconds")) {
@@ -23623,7 +23683,24 @@
peer->transports = default_transports;
/* Set default primary transport */
peer->socket.type = default_primary_transport;
+ }
+
+ /* If the original peer socket type before rebuilding the peer is NOT equal to the new one,
+ * override the new one with the original if a registration is present and the original type
+ * is still supported by the peer.
+ *
+ * The original socket information is used to keep the socket type consistent with what was
+ * specified during peer Registration. The default set during build_peer should only be used when a
+ * registration is not present. */
+ if ((original_transport != peer->socket.type) && ((peer->transports & original_transport)) && (peer->expire > -1)) {
+ peer->socket.type = original_transport;
+ } else if (original_transport != peer->socket.type) {
+ /* if the transport type changes, clear all socket data */
peer->socket.fd = -1;
+ if (peer->socket.tcptls_session) {
+ ao2_ref(peer->socket.tcptls_session, -1);
+ peer->socket.tcptls_session = NULL;
+ }
}
if (ast_dnsmgr_lookup(_srvlookup, &peer->addr, &peer->dnsmgr, sip_cfg.srvlookup ? transport : NULL)) {
Modified: team/dvossel/sip_via_tcp_rework/configs/sip.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/team/dvossel/sip_via_tcp_rework/configs/sip.conf.sample?view=diff&rev=194284&r1=194283&r2=194284
==============================================================================
--- team/dvossel/sip_via_tcp_rework/configs/sip.conf.sample (original)
+++ team/dvossel/sip_via_tcp_rework/configs/sip.conf.sample Wed May 13 10:03:53 2009
@@ -899,11 +899,14 @@
;remotesecret=guessit ; Our password to their service
;defaultuser=yourusername ; Authentication user for outbound proxies
;fromuser=yourusername ; Many SIP providers require this!
-;fromdomain=provider.sip.domain
+;fromdomain=provider.sip.domain
;host=box.provider.com
-;transport=udp,tcp ; This sets the transport type to udp for outgoing, and will
-; ; accept both tcp and udp. Default is udp. The first transport
-; ; listed will always be used for outgoing connections.
+;transport=udp,tcp ; This sets the default transport type to udp for outgoing, and will
+; ; accept both tcp and udp. The default transport type is only used for
+; ; outbound messages until a Registration takes place. During the
+; ; peer Registration the transport type may change to another supported
+; ; type if the peer requests so.
+
;usereqphone=yes ; This provider requires ";user=phone" on URI
;callcounter=yes ; Enable call counter
;busylevel=2 ; Signal busy at 2 or more calls
_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--
Modified: team/dvossel/sip_via_tcp_rework/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/dvossel/sip_via_tcp_rework/channels/chan_sip.c?view=diff&rev=194525&r1=194524&r2=194525
==============================================================================
--- team/dvossel/sip_via_tcp_rework/channels/chan_sip.c (original)
+++ team/dvossel/sip_via_tcp_rework/channels/chan_sip.c Thu May 14 17:27:03 2009
@@ -1909,6 +1909,8 @@
AST_STRING_FIELD(engine); /*!< RTP Engine to use */
);
struct sip_socket socket; /*!< Socket used for this peer */
+ enum sip_transport default_outbound_transport; /*!< Peer Registration may change the default outbound transport.
+ If register expires, default should be reset. to this value */
unsigned int transports:3; /*!< Transports (enum sip_transport) that are acceptable for this peer */
struct sip_auth *auth; /*!< Realm authentication list */
int amaflags; /*!< AMA Flags (for billing) */
@@ -1923,7 +1925,7 @@
int lastmsgssent;
unsigned int sipoptions; /*!< Supported SIP options */
struct ast_flags flags[2]; /*!< SIP_ flags */
-
+
/*! Mailboxes that this peer cares about */
AST_LIST_HEAD_NOLOCK(, sip_mailbox) mailboxes;
@@ -1945,7 +1947,7 @@
struct ast_dnsmgr_entry *dnsmgr;/*!< DNS refresh manager for peer */
struct sockaddr_in addr; /*!< IP address of peer */
int maxcallbitrate; /*!< Maximum Bitrate for a video call */
-
+
/* Qualification */
struct sip_pvt *call; /*!< Call pointer */
int pokeexpire; /*!< When to expire poke (qualify= checking) */
@@ -11435,11 +11437,24 @@
}
}
+static void set_peer_transport(struct sip_peer *peer, int transport)
+{
+ /* if the transport type changes, clear all socket data */
+ if (peer->socket.type != transport) {
+ peer->socket.type = transport;
+ peer->socket.fd = -1;
+ if (peer->socket.tcptls_session) {
+ ao2_ref(peer->socket.tcptls_session, -1);
+ peer->socket.tcptls_session = NULL;
+ }
+ }
+}
+
/*! \brief Expire registration of SIP peer */
static int expire_register(const void *data)
{
struct sip_peer *peer = (struct sip_peer *)data;
-
+
if (!peer) /* Hmmm. We have no peer. Weird. */
return 0;
destroy_association(peer); /* remove registration data from storage */
-
+ set_peer_transport(peer, peer->default_outbound_transport);
+
manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: SIP\r\nPeer: SIP/%s\r\nPeerStatus: Unregistered\r\nCause: Expired\r\n", peer->name);
register_peer_exten(peer, FALSE); /* Remove regexten */
ast_devstate_changed(AST_DEVICE_UNKNOWN, "SIP/%s", peer->name);
@@ -11747,12 +11763,7 @@
* transport type, change it. If it got this far, it is a
* supported type, but check just in case */
if ((peer->socket.type != transport_type) && (peer->transports & transport_type)) {
- peer->socket.type = transport_type;
- peer->socket.fd = -1;
- if (peer->socket.tcptls_session) {
- ao2_ref(peer->socket.tcptls_session, -1);
- peer->socket.tcptls_session = NULL;
- }
+ set_peer_transport(peer, transport_type);
}
oldsin = peer->addr;
@@ -23283,7 +23294,6 @@
int found = 0;
int firstpass = 1;
int format = 0; /* Ama flags */
- int original_transport = 0;
time_t regseconds = 0;
struct ast_flags peerflags[2] = {{(0)}};
struct ast_flags mask[2] = {{(0)}};
@@ -23346,8 +23356,7 @@
/* If we have realm authentication information, remove them (reload) */
clear_realm_authentication(peer->auth);
peer->auth = NULL;
- original_transport = peer->socket.type;
- peer->socket.type = 0;
+ peer->default_outbound_transport = 0;
peer->transports = 0;
for (; v || ((v = alt) && !(alt=NULL)); v = v->next) {
@@ -23360,7 +23369,7 @@
while ((trans = strsep(&val, ","))) {
trans = ast_skip_blanks(trans);
- if (!strncasecmp(trans, "udp", 3))
+ if (!strncasecmp(trans, "udp", 3))
peer->transports |= SIP_TRANSPORT_UDP;
else if (!strncasecmp(trans, "tcp", 3))
peer->transports |= SIP_TRANSPORT_TCP;
@@ -23369,8 +23378,8 @@
else
ast_log(LOG_NOTICE, "'%s' is not a valid transport type. if no other is specified, udp will be used.\n", trans);
- if (!peer->socket.type) { /*!< The first transport listed should be used for outgoing */
- peer->socket.type = peer->transports;
+ if (!peer->default_outbound_transport) { /*!< The first transport listed should be default outbound */
+ peer->default_outbound_transport = peer->transports;
}
}
} else if (realtime && !strcasecmp(v->name, "regseconds")) {
@@ -23678,29 +23687,21 @@
}
}
- if (!peer->socket.type) {
+ if (!peer->default_outbound_transport) {
/* Set default set of transports */
peer->transports = default_transports;
/* Set default primary transport */
- peer->socket.type = default_primary_transport;
- }
-
- /* If the original peer socket type before rebuilding the peer is NOT equal to the new one,
- * override the new one with the original if a registration is present and the original type
- * is still supported by the peer.
- *
- * The original socket information is used to keep the socket type consistent with what was
- * specified during peer Registration. The default set during build_peer should only be used when a
- * registration is not present. */
- if ((original_transport != peer->socket.type) && ((peer->transports & original_transport)) && (peer->expire > -1)) {
- peer->socket.type = original_transport;
- } else if (original_transport != peer->socket.type) {
- /* if the transport type changes, clear all socket data */
- peer->socket.fd = -1;
- if (peer->socket.tcptls_session) {
- ao2_ref(peer->socket.tcptls_session, -1);
- peer->socket.tcptls_session = NULL;
- }
+ peer->default_outbound_transport = default_primary_transport;
+ }
+
+ /* The default transport type set during build_peer should only replace the socket.type when...
+ * 1. Registration is not present and the socket.type and default transport types are different.
+ * 2. The socket.type is not an acceptable transport type after rebuilding peer.
+ * 3. The socket.type is not set yet. */
+ if (((peer->socket.type != peer->default_outbound_transport) && (peer->expire == -1)) ||
+ !(peer->socket.type & peer->transports) || !(peer->socket.type)) {
+
+ set_peer_transport(peer, peer->default_outbound_transport);
}
if (fullcontact->used > 0) {
_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--
Posted: Thu May 21, 2009 3:46 pm Post subject: [svn-commits] dvossel: branch dvossel/sip_via_tcp_rework r19
Author: dvossel
Date: Thu May 21 11:42:58 2009
New Revision: 195948
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=195948
Log:
Fixes issue with peer's default transport not being reset correctly after a peer unregisters. Before this the default transport would only reset itset if the peer's registration expired. This is not the same.
You cannot post new topics in this forum You cannot reply to topics in this forum You cannot edit your posts in this forum You cannot delete your posts in this forum You cannot vote in polls in this forum