<!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][14170] </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=14170">14170</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2009-07-09 11:04:59 -0500 (Thu, 09 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tue Jul 7 16:37:28 CDT 2009 Pekka Pessi <first.last@nokia.com>
* check_register: added test case register_1_3_3_2 for PING/PONG
Ignore-this: 8290679900c21df47071f26f2de60625
Disabled test case 1_3_3_1 for now.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibssofiasipupdate">freeswitch/trunk/libs/sofia-sip/.update</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuanuacheck_registerc">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.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 (14169 => 14170)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/.update 2009-07-09 16:04:14 UTC (rev 14169)
+++ freeswitch/trunk/libs/sofia-sip/.update 2009-07-09 16:04:59 UTC (rev 14170)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Thu Jul 9 11:01:43 CDT 2009
</del><ins>+Thu Jul 9 11:03:20 CDT 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuanuacheck_registerc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c (14169 => 14170)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c 2009-07-09 16:04:14 UTC (rev 14169)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c 2009-07-09 16:04:59 UTC (rev 14170)
</span><span class="lines">@@ -647,6 +647,7 @@
</span><span class="cx"> }
</span><span class="cx"> END_TEST
</span><span class="cx">
</span><ins>+#if nomore
</ins><span class="cx"> START_TEST(register_1_3_3_1)
</span><span class="cx"> {
</span><span class="cx"> nua_handle_t *nh = nua_handle(nua, NULL, TAG_END());
</span><span class="lines">@@ -737,7 +738,110 @@
</span><span class="cx"> s2_register_teardown();
</span><span class="cx"> }
</span><span class="cx"> END_TEST
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+START_TEST(register_1_3_3_2)
+{
+ nua_handle_t *nh = nua_handle(nua, NULL, TAG_END());
+ struct message *m;
+ tport_t *tcp;
+ int i;
+
+ S2_CASE("1.3.3.2", "Register behind NAT with TCP",
+ "Register w/ TCP using rport, pingpong. ");
+
+ nua_set_params(nua, NTATAG_TCP_RPORT(1), TAG_END());
+ fail_unless_event(nua_r_set_params, 200);
+
+ mark_point();
+ s2->registration->nh = nh;
+
+ nua_register(nh,
+ NUTAG_PROXY(s2sip->tcp.contact->m_url),
+ NUTAG_OUTBOUND("no-options-keepalive, no-validate"),
+ TAG_END());
+
+ m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m);
+
+ fail_unless(tport_is_tcp(m->tport));
+
+ tcp = tport_ref(m->tport);
+
+ /* Respond to request over TCP */
+ s2_sip_respond_to(m, NULL,
+ SIP_401_UNAUTHORIZED,
+ SIPTAG_WWW_AUTHENTICATE_STR(s2_auth_digest_str),
+ SIPTAG_VIA(natted_via(m, receive_natted)),
+ TAG_END());
+ s2_sip_free_message(m);
+ fail_unless_event(nua_r_register, 401);
+ nua_authenticate(nh, NUTAG_AUTH(s2_auth_credentials), TAG_END());
+
+ m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
+ fail_if(!m); fail_if(!m->sip->sip_authorization);
+ fail_if(!m->sip->sip_contact);
+ s2_save_register(m);
+
+ s2_sip_respond_to(m, NULL,
+ SIP_200_OK,
+ SIPTAG_CONTACT(s2->registration->contact),
+ SIPTAG_VIA(natted_via(m, receive_natted)),
+ TAG_END());
+ s2_sip_free_message(m);
+
+ fail_unless_event(nua_r_register, 200);
+
+ fail_unless(s2->registration->contact != NULL);
+ fail_if(s2->registration->contact->m_next != NULL);
+
+ /* Turn off pong */
+ tport_set_params(tcp, TPTAG_PONG2PING(0), TAG_END());
+
+ /* Wait until ping-pong failure closes the TCP connection */
+ for (i = 0; i < 100; i++) {
+ s2_nua_fast_forward(5, s2base->root);
+ if (tport_is_closed(tcp))
+ break;
+ }
+
+ m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
+ fail_unless(tport_is_tcp(m->tport));
+ fail_unless(tcp != m->tport);
+ fail_if(!m); fail_if(!m->sip->sip_authorization);
+ fail_if(!m->sip->sip_contact);
+ s2_save_register(m);
+
+ s2_sip_respond_to(m, NULL,
+ SIP_200_OK,
+ SIPTAG_CONTACT(s2->registration->contact),
+ SIPTAG_VIA(natted_via(m, receive_natted)),
+ TAG_END());
+ s2_sip_free_message(m);
+
+ tport_unref(tcp);
+
+ /* Contact changed */
+ fail_unless_event(nua_r_register, 100);
+
+ m = s2_sip_wait_for_request(SIP_METHOD_REGISTER);
+ fail_if(!m); fail_if(!m->sip->sip_authorization);
+ fail_if(!m->sip->sip_contact);
+ fail_if(!m->sip->sip_contact->m_next);
+ s2_save_register(m);
+
+ s2_sip_respond_to(m, NULL,
+ SIP_200_OK,
+ SIPTAG_CONTACT(s2->registration->contact),
+ SIPTAG_VIA(natted_via(m, receive_natted)),
+ TAG_END());
+ s2_sip_free_message(m);
+
+ fail_unless_event(nua_r_register, 200);
+
+ s2_register_teardown();
+}
+END_TEST
+
</ins><span class="cx"> /* ---------------------------------------------------------------------- */
</span><span class="cx">
</span><span class="cx"> TCase *register_tcase(int threading)
</span><span class="lines">@@ -770,7 +874,7 @@
</span><span class="cx"> add_register_fixtures(tc, threading, 1);
</span><span class="cx">
</span><span class="cx"> {
</span><del>- tcase_add_test(tc, register_1_3_3_1);
</del><ins>+ tcase_add_test(tc, register_1_3_3_2);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> tcase_set_timeout(tc, 10);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>