<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14076">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmux: Extend osmux_out_handle and add new API to set rtp payload_type<br><br>Previously payload_type was always hardcoded to 98 for generated rtp<br>packets from incoming osmux frame.<br><br>Change-Id: I5cbeb494a8932953d9fd2dc24dacf8cd97fd84e4<br>---<br>M TODO-RELEASE<br>M include/osmocom/netif/osmux.h<br>M src/osmux.c<br>M tests/jibuf/jibuf_tool.c<br>M tests/osmo-pcap-test/osmux_test.c<br>M tests/osmux/osmux_test.c<br>M tests/osmux/osmux_test2.c<br>7 files changed, 22 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index d0852fc..45ebb75 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -7,3 +7,5 @@</span><br><span> # If any interfaces have been added since the last public release: c:r:a + 1.</span><br><span> # If any interfaces have been removed or changed since the last public release: c:r:0.</span><br><span> #library what description / commit summary line</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo-netif Add new field to struct osmux_out_handle Breaks ABI with older versions</span><br><span style="color: hsl(120, 100%, 40%);">+libosmo-netif Add new API osmux_xfrm_output_init2 Deprecates old osmux_xfrm_output_init</span><br><span>diff --git a/include/osmocom/netif/osmux.h b/include/osmocom/netif/osmux.h</span><br><span>index dfed66a..7dee438 100644</span><br><span>--- a/include/osmocom/netif/osmux.h</span><br><span>+++ b/include/osmocom/netif/osmux.h</span><br><span>@@ -80,6 +80,7 @@</span><br><span> uint16_t rtp_seq;</span><br><span> uint32_t rtp_timestamp;</span><br><span> uint32_t rtp_ssrc;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t rtp_payload_type;</span><br><span> uint8_t osmux_seq_ack; /* Latest received seq num */</span><br><span> struct osmo_timer_list timer;</span><br><span> struct llist_head list;</span><br><span>@@ -106,7 +107,8 @@</span><br><span> int osmux_xfrm_input(struct osmux_in_handle *h, struct msgb *msg, int ccid);</span><br><span> void osmux_xfrm_input_deliver(struct osmux_in_handle *h);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void osmux_xfrm_output_init(struct osmux_out_handle *h, uint32_t rtp_ssrc);</span><br><span style="color: hsl(120, 100%, 40%);">+void osmux_xfrm_output_init(struct osmux_out_handle *h, uint32_t rtp_ssrc) OSMO_DEPRECATED("Use osmux_xfrm_output_init2() instead");</span><br><span style="color: hsl(120, 100%, 40%);">+void osmux_xfrm_output_init2(struct osmux_out_handle *h, uint32_t rtp_ssrc, uint8_t rtp_payload_type);</span><br><span> void osmux_xfrm_output_set_tx_cb(struct osmux_out_handle *h, void (*tx_cb)(struct msgb *msg, void *data), void *data);</span><br><span> int osmux_xfrm_output(struct osmux_hdr *osmuxh, struct osmux_out_handle *h, struct llist_head *list) OSMO_DEPRECATED("Use osmux_xfrm_output_sched() instead");</span><br><span> int osmux_xfrm_output_sched(struct osmux_out_handle *h, struct osmux_hdr *osmuxh);</span><br><span>diff --git a/src/osmux.c b/src/osmux.c</span><br><span>index 7a6ce60..8b6a115 100644</span><br><span>--- a/src/osmux.c</span><br><span>+++ b/src/osmux.c</span><br><span>@@ -146,7 +146,7 @@</span><br><span> rtph->csrc_count = 0;</span><br><span> rtph->extension = 0;</span><br><span> rtph->version = RTP_VERSION;</span><br><span style="color: hsl(0, 100%, 40%);">- rtph->payload_type = 98;</span><br><span style="color: hsl(120, 100%, 40%);">+ rtph->payload_type = h->rtp_payload_type;</span><br><span> /* ... emulate timestamp and ssrc */</span><br><span> rtph->timestamp = htonl(h->rtp_timestamp);</span><br><span> rtph->sequence = htons(h->rtp_seq);</span><br><span>@@ -999,16 +999,23 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void osmux_xfrm_output_init(struct osmux_out_handle *h, uint32_t rtp_ssrc)</span><br><span style="color: hsl(120, 100%, 40%);">+void osmux_xfrm_output_init2(struct osmux_out_handle *h, uint32_t rtp_ssrc, uint8_t rtp_payload_type)</span><br><span> {</span><br><span> memset(h, 0, sizeof(*h));</span><br><span> h->rtp_seq = (uint16_t)random();</span><br><span> h->rtp_timestamp = (uint32_t)random();</span><br><span> h->rtp_ssrc = rtp_ssrc;</span><br><span style="color: hsl(120, 100%, 40%);">+ h->rtp_payload_type = rtp_payload_type;</span><br><span> INIT_LLIST_HEAD(&h->list);</span><br><span> osmo_timer_setup(&h->timer, osmux_xfrm_output_trigger, h);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void osmux_xfrm_output_init(struct osmux_out_handle *h, uint32_t rtp_ssrc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* backward compatibility with old users, where 98 was harcoded in osmux_rebuild_rtp() */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_init2(h, rtp_ssrc, 98);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define SNPRINTF_BUFFER_SIZE(ret, remain, offset) \</span><br><span> if (ret < 0) \</span><br><span> ret = 0; \</span><br><span>diff --git a/tests/jibuf/jibuf_tool.c b/tests/jibuf/jibuf_tool.c</span><br><span>index bd444a7..df11131 100644</span><br><span>--- a/tests/jibuf/jibuf_tool.c</span><br><span>+++ b/tests/jibuf/jibuf_tool.c</span><br><span>@@ -517,7 +517,7 @@</span><br><span> osmo_pcap.timer.cb = pcap_pkt_timer_cb;</span><br><span> </span><br><span> if(opt_osmux) {</span><br><span style="color: hsl(0, 100%, 40%);">- osmux_xfrm_output_init(&pcap_osmux_h, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_init2(&pcap_osmux_h, 0, 98);</span><br><span> osmux_xfrm_output_set_tx_cb(&pcap_osmux_h, glue_cb, NULL);</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/osmo-pcap-test/osmux_test.c b/tests/osmo-pcap-test/osmux_test.c</span><br><span>index 7ec78a0..9163753 100644</span><br><span>--- a/tests/osmo-pcap-test/osmux_test.c</span><br><span>+++ b/tests/osmo-pcap-test/osmux_test.c</span><br><span>@@ -189,7 +189,7 @@</span><br><span> osmo_pcap.timer.cb = osmo_pcap_pkt_timer_cb;</span><br><span> </span><br><span> osmux_xfrm_input_init(&h_input);</span><br><span style="color: hsl(0, 100%, 40%);">- osmux_xfrm_output_init(&h_output);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_init2(&h_output, 0, 98);</span><br><span> osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, NULL);</span><br><span> </span><br><span> /* first run */</span><br><span>diff --git a/tests/osmux/osmux_test.c b/tests/osmux/osmux_test.c</span><br><span>index 704ccbc..e2eb777 100644</span><br><span>--- a/tests/osmux/osmux_test.c</span><br><span>+++ b/tests/osmux/osmux_test.c</span><br><span>@@ -269,7 +269,7 @@</span><br><span> osmo_init_logging2(tall_ctx, &osmux_test_log_info);</span><br><span> log_set_log_level(osmo_stderr_target, LOGL_DEBUG);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmux_xfrm_output_init(&h_output, 0x7000000);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_init2(&h_output, 0x7000000, 98);</span><br><span> osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, NULL);</span><br><span> </span><br><span> /* If the test takes longer than 10 seconds, abort it */</span><br><span>diff --git a/tests/osmux/osmux_test2.c b/tests/osmux/osmux_test2.c</span><br><span>index ecd9296..ffe1101 100644</span><br><span>--- a/tests/osmux/osmux_test2.c</span><br><span>+++ b/tests/osmux/osmux_test2.c</span><br><span>@@ -164,7 +164,7 @@</span><br><span> clock_override_enable(true);</span><br><span> clock_override_set(0, 0);</span><br><span> osmux_init(32);</span><br><span style="color: hsl(0, 100%, 40%);">- osmux_xfrm_output_init(&h_output, 0x7000000);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_init2(&h_output, 0x7000000, 98);</span><br><span> h_output.rtp_seq = (uint16_t)50;</span><br><span> h_output.rtp_timestamp = (uint32_t)500;</span><br><span> osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, &h_output);</span><br><span>@@ -226,7 +226,7 @@</span><br><span> clock_override_enable(true);</span><br><span> clock_override_set(0, 0);</span><br><span> osmux_init(32);</span><br><span style="color: hsl(0, 100%, 40%);">- osmux_xfrm_output_init(&h_output, 0x7000000);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_init2(&h_output, 0x7000000, 98);</span><br><span> h_output.rtp_seq = (uint16_t)50;</span><br><span> h_output.rtp_timestamp = (uint32_t)500;</span><br><span> osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, &h_output);</span><br><span>@@ -263,7 +263,7 @@</span><br><span> clock_override_enable(true);</span><br><span> clock_override_set(0, 0);</span><br><span> osmux_init(32);</span><br><span style="color: hsl(0, 100%, 40%);">- osmux_xfrm_output_init(&h_output, 0x7000000);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_init2(&h_output, 0x7000000, 98);</span><br><span> h_output.rtp_seq = (uint16_t)50;</span><br><span> h_output.rtp_timestamp = (uint32_t)500;</span><br><span> osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, &h_output);</span><br><span>@@ -297,7 +297,7 @@</span><br><span> clock_override_enable(true);</span><br><span> clock_override_set(0, 0);</span><br><span> osmux_init(32);</span><br><span style="color: hsl(0, 100%, 40%);">- osmux_xfrm_output_init(&h_output, 0x7000000);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_init2(&h_output, 0x7000000, 98);</span><br><span> h_output.rtp_seq = (uint16_t)50;</span><br><span> h_output.rtp_timestamp = (uint32_t)500;</span><br><span> osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, &h_output);</span><br><span>@@ -329,7 +329,7 @@</span><br><span> clock_override_enable(true);</span><br><span> clock_override_set(0, 0);</span><br><span> osmux_init(32);</span><br><span style="color: hsl(0, 100%, 40%);">- osmux_xfrm_output_init(&h_output, 0x7000000);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmux_xfrm_output_init2(&h_output, 0x7000000, 98);</span><br><span> h_output.rtp_seq = (uint16_t)50;</span><br><span> h_output.rtp_timestamp = (uint32_t)500;</span><br><span> osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, &h_output);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14076">change 14076</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/14076"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5cbeb494a8932953d9fd2dc24dacf8cd97fd84e4 </div>
<div style="display:none"> Gerrit-Change-Number: 14076 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>