<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14185] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14185">14185</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-07-09 19:46:07 -0500 (Thu, 09 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tue Jul 7 18:41:48 CDT 2009 Pekka Pessi <first.last@nokia.com>
* nta.c: only explicitly copying fields into tagged transaction when forking
Ignore-this: 6a60a9da78188823a70d5dfe05e5d060
Removed extra fields from outgoing transaction.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibssofiasipupdate">freeswitch/trunk/libs/sofia-sip/.update</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuantantac">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibssofiasipupdate"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/.update (14184 => 14185)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:45:13 UTC (rev 14184)
+++ freeswitch/trunk/libs/sofia-sip/.update 2009-07-10 00:46:07 UTC (rev 14185)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Thu Jul 9 19:43:30 CDT 2009
</del><ins>+Thu Jul 9 19:44:05 CDT 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuantantac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (14184 => 14185)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c 2009-07-10 00:45:13 UTC (rev 14184)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c 2009-07-10 00:46:07 UTC (rev 14185)
</span><span class="lines">@@ -529,6 +529,7 @@
</span><span class="cx"> unsigned orq_forked:1; /**< Tagged fork */
</span><span class="cx">
</span><span class="cx"> /* Attributes */
</span><ins>+ unsigned orq_sips:1;
</ins><span class="cx"> unsigned orq_uas:1; /**< Running this transaction as UAS */
</span><span class="cx"> unsigned orq_user_via:1;
</span><span class="cx"> unsigned orq_stateless:1;
</span><span class="lines">@@ -543,27 +544,24 @@
</span><span class="cx"> #if HAVE_SOFIA_SRESOLV
</span><span class="cx"> sipdns_resolver_t *orq_resolver;
</span><span class="cx"> #endif
</span><del>- enum nta_res_order_e orq_res_order; /**< AAAA/A first? */
-
</del><span class="cx"> url_t *orq_route; /**< Route URL */
</span><span class="cx"> tp_name_t orq_tpn[1]; /**< Where to send request */
</span><del>- char const *orq_scheme; /**< Transport URL type */
</del><span class="cx">
</span><span class="cx"> tport_t *orq_tport;
</span><span class="cx"> struct sigcomp_compartment *orq_cc;
</span><span class="cx"> tagi_t *orq_tags; /**< Tport tag items */
</span><del>- int orq_pending; /**< Request is pending in tport */
</del><span class="cx">
</span><span class="cx"> char const *orq_branch; /**< Transaction branch */
</span><span class="cx"> char const *orq_via_branch; /**< @Via branch */
</span><span class="cx">
</span><span class="cx"> int *orq_status2b; /**< Delayed response */
</span><span class="cx">
</span><del>- nta_outgoing_t *orq_cancel; /**< CANCEL transaction */
</del><ins>+ nta_outgoing_t *orq_cancel; /**< Delayed CANCEL transaction */
</ins><span class="cx">
</span><span class="cx"> nta_outgoing_t *orq_forking; /**< Untagged transaction */
</span><span class="cx"> nta_outgoing_t *orq_forks; /**< Tagged transactions */
</span><span class="cx"> uint32_t orq_rseq; /**< Latest incoming rseq */
</span><ins>+ int orq_pending; /**< Request is pending in tport */
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* ------------------------------------------------------------------------- */
</span><span class="lines">@@ -7113,7 +7111,9 @@
</span><span class="cx"> sip_t const *sip);
</span><span class="cx">
</span><span class="cx"> #if HAVE_SOFIA_SRESOLV
</span><del>-static void outgoing_resolve(nta_outgoing_t *orq, int explicit_transport);
</del><ins>+static void outgoing_resolve(nta_outgoing_t *orq,
+ int explicit_transport,
+ enum nta_res_order_e order);
</ins><span class="cx"> su_inline void outgoing_cancel_resolver(nta_outgoing_t *orq);
</span><span class="cx"> su_inline void outgoing_destroy_resolver(nta_outgoing_t *orq);
</span><span class="cx"> static int outgoing_other_destinations(nta_outgoing_t const *orq);
</span><span class="lines">@@ -7749,7 +7749,6 @@
</span><span class="cx"> orq->orq_pass_100 = pass_100 != 0;
</span><span class="cx"> orq->orq_sigcomp_zap = sigcomp_zap;
</span><span class="cx"> orq->orq_sigcomp_new = comp != NONE && comp != NULL;
</span><del>- orq->orq_res_order = res_order;
</del><span class="cx"> orq->orq_timestamp = use_timestamp;
</span><span class="cx"> orq->orq_delay = UINT_MAX;
</span><span class="cx"> orq->orq_stateless = stateless != 0;
</span><span class="lines">@@ -7783,7 +7782,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> resolved = tport_name_is_resolved(orq->orq_tpn);
</span><span class="cx"> orq->orq_url = url_hdup(home, sip->sip_request->rq_url);
</span><del>- scheme = "sip"; /* XXX */
</del><span class="cx"> }
</span><span class="cx"> else if (route_url && !orq->orq_user_tport) {
</span><span class="cx"> invalid = nta_tpn_by_url(home, orq->orq_tpn, &scheme, &port, route_url);
</span><span class="lines">@@ -7885,7 +7883,7 @@
</span><span class="cx"> #else
</span><span class="cx"> orq->orq_resolved = resolved = 1;
</span><span class="cx"> #endif
</span><del>- orq->orq_scheme = scheme;
</del><ins>+ orq->orq_sips = su_casematch(scheme, "sips");
</ins><span class="cx">
</span><span class="cx"> if (invalid < 0 || !orq->orq_branch || msg_serialize(msg, (void *)sip) < 0) {
</span><span class="cx"> SU_DEBUG_3(("nta outgoing create: %s\n",
</span><span class="lines">@@ -7906,7 +7904,7 @@
</span><span class="cx"> outgoing_prepare_send(orq);
</span><span class="cx"> #if HAVE_SOFIA_SRESOLV
</span><span class="cx"> else
</span><del>- outgoing_resolve(orq, explicit_transport);
</del><ins>+ outgoing_resolve(orq, explicit_transport, res_order);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (stateless &&
</span><span class="lines">@@ -7938,10 +7936,9 @@
</span><span class="cx"> nta_agent_t *sa = orq->orq_agent;
</span><span class="cx"> tport_t *tp;
</span><span class="cx"> tp_name_t *tpn = orq->orq_tpn;
</span><del>- int sips = su_casematch(orq->orq_scheme, "sips");
</del><span class="cx">
</span><span class="cx"> /* Select transport by scheme */
</span><del>- if (sips && strcmp(tpn->tpn_proto, "*") == 0)
</del><ins>+ if (orq->orq_sips && strcmp(tpn->tpn_proto, "*") == 0)
</ins><span class="cx"> tpn->tpn_proto = "tls";
</span><span class="cx">
</span><span class="cx"> if (!tpn->tpn_port)
</span><span class="lines">@@ -7950,7 +7947,7 @@
</span><span class="cx"> tp = tport_by_name(sa->sa_tports, tpn);
</span><span class="cx">
</span><span class="cx"> if (tpn->tpn_port[0] == '\0') {
</span><del>- if (sips || tport_has_tls(tp))
</del><ins>+ if (orq->orq_sips || tport_has_tls(tp))
</ins><span class="cx"> tpn->tpn_port = "5061";
</span><span class="cx"> else
</span><span class="cx"> tpn->tpn_port = "5060";
</span><span class="lines">@@ -7959,7 +7956,7 @@
</span><span class="cx"> if (tp) {
</span><span class="cx"> outgoing_send_via(orq, tp);
</span><span class="cx"> }
</span><del>- else if (sips) {
</del><ins>+ else if (orq->orq_sips) {
</ins><span class="cx"> SU_DEBUG_3(("nta outgoing create: no secure transport\n"));
</span><span class="cx"> outgoing_reply(orq, SIP_416_UNSUPPORTED_URI, 1);
</span><span class="cx"> }
</span><span class="lines">@@ -9779,7 +9776,9 @@
</span><span class="cx">
</span><span class="cx"> /** Resolve a request destination */
</span><span class="cx"> static void
</span><del>-outgoing_resolve(nta_outgoing_t *orq, int explicit_transport)
</del><ins>+outgoing_resolve(nta_outgoing_t *orq,
+ int explicit_transport,
+ enum nta_res_order_e res_order)
</ins><span class="cx"> {
</span><span class="cx"> struct sipdns_resolver *sr = NULL;
</span><span class="cx"> char const *tpname = orq->orq_tpn->tpn_proto;
</span><span class="lines">@@ -9868,7 +9867,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch (orq->orq_res_order) {
</del><ins>+ switch (res_order) {
</ins><span class="cx"> default:
</span><span class="cx"> case nta_res_ip6_ip4:
</span><span class="cx"> sr->sr_a_aaaa1 = sres_type_aaaa, sr->sr_a_aaaa2 = sres_type_a;
</span><span class="lines">@@ -11317,40 +11316,54 @@
</span><span class="cx"> assert(orq->orq_agent); assert(orq->orq_request);
</span><span class="cx">
</span><span class="cx"> agent = orq->orq_agent;
</span><del>- tagged = su_alloc(agent->sa_home, sizeof(*tagged));
</del><ins>+ tagged = su_zalloc(agent->sa_home, sizeof(*tagged));
+
</ins><span class="cx"> home = msg_home((msg_t *)orq->orq_request);
</span><span class="cx">
</span><del>- *tagged = *orq;
</del><ins>+ tagged->orq_hash = orq->orq_hash;
+ tagged->orq_agent = orq->orq_agent;
</ins><span class="cx"> tagged->orq_callback = callback;
</span><span class="cx"> tagged->orq_magic = magic;
</span><span class="cx">
</span><del>- tagged->orq_prev = NULL, tagged->orq_next = NULL, tagged->orq_queue = NULL;
- tagged->orq_rprev = NULL, tagged->orq_rnext = NULL;
-#if HAVE_SOFIA_SRESOLV
- tagged->orq_resolver = NULL;
-#endif
</del><ins>+ tagged->orq_method = orq->orq_method;
+ tagged->orq_method_name = orq->orq_method_name;
+ tagged->orq_url = orq->orq_url;
+ tagged->orq_from = orq->orq_from;
</ins><span class="cx">
</span><del>- if (tagged->orq_cc)
- nta_compartment_ref(tagged->orq_cc);
-
</del><span class="cx"> sip_to_tag(home, to = sip_to_copy(home, orq->orq_to), to_tag);
</span><span class="cx">
</span><del>- tagged->orq_to = to;
- tagged->orq_tag = to->a_tag;
- tagged->orq_tport = tport_ref(orq->orq_tport);
- tagged->orq_request = msg_ref_create(orq->orq_request);
- tagged->orq_response = msg_ref_create(orq->orq_response);
- tagged->orq_cancel = NULL;
</del><ins>+ tagged->orq_to = to;
+ tagged->orq_tag = to->a_tag;
+ tagged->orq_cseq = orq->orq_cseq;
+ tagged->orq_call_id = orq->orq_call_id;
</ins><span class="cx">
</span><del>- if ((tagged->orq_uas = orq->orq_uas)) {
- tagged->orq_forking = orq;
- tagged->orq_forks = orq->orq_forks;
- tagged->orq_forked = 1;
</del><ins>+ tagged->orq_request = msg_ref_create(orq->orq_request);
+ tagged->orq_response = msg_ref_create(orq->orq_response);
+
+ tagged->orq_status = orq->orq_status;
+ tagged->orq_via_added = orq->orq_via_added;
+ tagged->orq_prepared = orq->orq_prepared;
+ tagged->orq_reliable = orq->orq_reliable;
+ tagged->orq_sips = orq->orq_sips;
+ tagged->orq_uas = orq->orq_uas;
+ tagged->orq_pass_100 = orq->orq_pass_100;
+ tagged->orq_must_100rel = orq->orq_must_100rel;
+ tagged->orq_100rel = orq->orq_100rel;
+ tagged->orq_route = orq->orq_route;
+ *tagged->orq_tpn = *orq->orq_tpn;
+ tagged->orq_tport = tport_ref(orq->orq_tport);
+ if (orq->orq_cc)
+ tagged->orq_cc = nta_compartment_ref(orq->orq_cc);
+ tagged->orq_branch = orq->orq_branch;
+ tagged->orq_via_branch = orq->orq_via_branch;
+
+ if (tagged->orq_uas) {
+ tagged->orq_forking = orq;
+ tagged->orq_forks = orq->orq_forks;
+ tagged->orq_forked = 1;
</ins><span class="cx"> orq->orq_forks = tagged;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- tagged->orq_rseq = 0;
-
</del><span class="cx"> outgoing_insert(agent, tagged);
</span><span class="cx">
</span><span class="cx"> return tagged;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>