<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13023">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NS: Factor out gprs_nsvc_start_test() and use it<br><br>This function performs sending a NS-ALIVE PDU and starting Tns-Test,<br>let's use it in all places where we used to do that.<br><br>As part of this, also fix a bug where the sendto() return value (number<br>of bytes sent) would actually propagate up all thw ay to<br>gprs_ns_rx_reset() return value, which in turn affects the test results<br>on stdout.<br><br>Change-Id: I4d303117f77fabb74bbb91887b9914a81c2a084a<br>---<br>M src/gb/gb_internal.h<br>M src/gb/gprs_ns.c<br>M tests/gb/gprs_ns_test.ok<br>3 files changed, 21 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/23/13023/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gb_internal.h b/src/gb/gb_internal.h</span><br><span>index c1fa8e1..72d940f 100644</span><br><span>--- a/src/gb/gb_internal.h</span><br><span>+++ b/src/gb/gb_internal.h</span><br><span>@@ -4,6 +4,7 @@</span><br><span> #include <osmocom/gsm/tlv.h></span><br><span> #include <osmocom/gprs/gprs_ns.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void gprs_nsvc_start_test(struct gprs_nsvc *nsvc);</span><br><span> int gprs_ns_tx_sns_ack(struct gprs_nsvc *nsvc, uint8_t trans_id, uint8_t *cause,</span><br><span> const struct gprs_ns_ie_ip4_elem *ip4_elems,unsigned int num_ip4_elems);</span><br><span> </span><br><span>diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c</span><br><span>index de550ea..c48ab9c 100644</span><br><span>--- a/src/gb/gprs_ns.c</span><br><span>+++ b/src/gb/gprs_ns.c</span><br><span>@@ -1170,8 +1170,7 @@</span><br><span> rc = gprs_ns_tx_reset_ack(*nsvc);</span><br><span> </span><br><span> /* start the test procedure */</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns_tx_alive(*nsvc);</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc_start_timer((*nsvc), NSVC_TIMER_TNS_TEST);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_nsvc_start_test(*nsvc);</span><br><span> </span><br><span> return rc;</span><br><span> }</span><br><span>@@ -1294,10 +1293,9 @@</span><br><span> osmo_timer_del(&(*nsvc)->timer);</span><br><span> }</span><br><span> /* Initiate TEST proc.: Send ALIVE and start timer */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = gprs_ns_tx_alive(*nsvc);</span><br><span style="color: hsl(0, 100%, 40%);">- nsvc_start_timer(*nsvc, NSVC_TIMER_TNS_TEST);</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_nsvc_start_test(*nsvc);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> static int gprs_ns_rx_block(struct gprs_nsvc *nsvc, struct msgb *msg)</span><br><span>@@ -1948,4 +1946,11 @@</span><br><span> return s;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Start the ALIVE timer procedure in all NS-VCs part of this NS Instance */</span><br><span style="color: hsl(120, 100%, 40%);">+void gprs_nsvc_start_test(struct gprs_nsvc *nsvc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns_tx_alive(nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ nsvc_start_timer(nsvc, NSVC_TIMER_TNS_TEST);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! @} */</span><br><span>diff --git a/tests/gb/gprs_ns_test.ok b/tests/gb/gprs_ns_test.ok</span><br><span>index 3cb1dfc..57ae188 100644</span><br><span>--- a/tests/gb/gprs_ns_test.ok</span><br><span>+++ b/tests/gb/gprs_ns_test.ok</span><br><span>@@ -344,7 +344,7 @@</span><br><span> MESSAGE to BSS, msg length 1</span><br><span> 0a </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-result (RESET_ACK) = 1</span><br><span style="color: hsl(120, 100%, 40%);">+result (RESET_ACK) = 0</span><br><span> </span><br><span> Current NS-VCIs:</span><br><span> VCI 0x2001, NSEI 0x2000, peer 0x01020304:2222, ALIVE, UNBLOCKED, UNRESET</span><br><span>@@ -365,7 +365,7 @@</span><br><span> MESSAGE to BSS, msg length 1</span><br><span> 0a </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-result (RESET_ACK) = 1</span><br><span style="color: hsl(120, 100%, 40%);">+result (RESET_ACK) = 0</span><br><span> </span><br><span> Current NS-VCIs:</span><br><span> VCI 0x2001, NSEI 0x2000, peer 0x00000000:0, DEAD, BLOCKED, RESET</span><br><span>@@ -386,7 +386,7 @@</span><br><span> MESSAGE to BSS, msg length 1</span><br><span> 0a </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-result (RESET_ACK) = 1</span><br><span style="color: hsl(120, 100%, 40%);">+result (RESET_ACK) = 0</span><br><span> </span><br><span> Current NS-VCIs:</span><br><span> VCI 0x2001, NSEI 0x2000, peer 0x00000000:0, DEAD, BLOCKED, RESET</span><br><span>@@ -534,7 +534,7 @@</span><br><span> MESSAGE to BSS, msg length 1</span><br><span> 0a </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-result (RESET_ACK) = 1</span><br><span style="color: hsl(120, 100%, 40%);">+result (RESET_ACK) = 0</span><br><span> </span><br><span> Current NS-VCIs:</span><br><span> VCI 0xf001, NSEI 0x1000, peer 0x00000000:0, ALIVE, BLOCKED, UNRESET</span><br><span>@@ -557,7 +557,7 @@</span><br><span> MESSAGE to BSS, msg length 1</span><br><span> 0a </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-result (RESET_ACK) = 1</span><br><span style="color: hsl(120, 100%, 40%);">+result (RESET_ACK) = 0</span><br><span> </span><br><span> Current NS-VCIs:</span><br><span> VCI 0xf001, NSEI 0x1000, peer 0x01020304:2222, ALIVE, BLOCKED, UNRESET</span><br><span>@@ -641,7 +641,7 @@</span><br><span> MESSAGE to BSS, msg length 1</span><br><span> 0a </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-result (RESET_ACK) = 1</span><br><span style="color: hsl(120, 100%, 40%);">+result (RESET_ACK) = 0</span><br><span> </span><br><span> Current NS-VCIs:</span><br><span> VCI 0xf001, NSEI 0x1000, peer 0x00000000:0, ALIVE, BLOCKED, UNRESET</span><br><span>@@ -666,7 +666,7 @@</span><br><span> MESSAGE to SGSN, msg length 1</span><br><span> 0a </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-result (RESET_ACK) = 1</span><br><span style="color: hsl(120, 100%, 40%);">+result (RESET_ACK) = 0</span><br><span> </span><br><span> PROCESSING ALIVE_ACK from 0x05060708:32000</span><br><span> 0b </span><br><span>@@ -818,7 +818,7 @@</span><br><span> MESSAGE to SGSN, msg length 1</span><br><span> 0a </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-result (RESET_ACK) = 1</span><br><span style="color: hsl(120, 100%, 40%);">+result (RESET_ACK) = 0</span><br><span> </span><br><span> PROCESSING ALIVE_ACK from 0x05060708:32000</span><br><span> 0b </span><br><span>@@ -898,7 +898,7 @@</span><br><span> MESSAGE to SGSN, msg length 1</span><br><span> 0a </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-result (RESET_ACK) = 1</span><br><span style="color: hsl(120, 100%, 40%);">+result (RESET_ACK) = 0</span><br><span> </span><br><span> PROCESSING ALIVE_ACK from 0x05060708:32000</span><br><span> 0b </span><br><span>@@ -956,7 +956,7 @@</span><br><span> MESSAGE to SGSN, msg length 1</span><br><span> 0a </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-result (RESET_ACK) = 1</span><br><span style="color: hsl(120, 100%, 40%);">+result (RESET_ACK) = 0</span><br><span> </span><br><span> PROCESSING ALIVE_ACK from 0x05060708:32000</span><br><span> 0b </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13023">change 13023</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13023"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I4d303117f77fabb74bbb91887b9914a81c2a084a </div>
<div style="display:none"> Gerrit-Change-Number: 13023 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>