<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/19805">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ipa_proto: Add support for Osmocom Extended Stream IDs<br><br>IPAC_PROTO_OSMO reserves one StreamID and creates a new hierarchy<br>of 256 different Osmocom specifice stream Identifiers. It adds one<br>extra byte for this (the first byte in the payload).<br><br>Change-Id: I765e0d96523feec401d6fb04693189281c580d04<br>---<br>M src/ipa_proto.erl<br>1 file changed, 12 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ipa_proto.erl b/src/ipa_proto.erl</span><br><span>index 2d851e3..c191a74 100644</span><br><span>--- a/src/ipa_proto.erl</span><br><span>+++ b/src/ipa_proto.erl</span><br><span>@@ -1,6 +1,6 @@</span><br><span> % ip.access IPA multiplex protocol </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-% (C) 2010 by Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+% (C) 2010,2012,2019 by Harald Welte <laforge@gnumonks.org></span><br><span> % (C) 2010 by On-Waves</span><br><span> %</span><br><span> % All Rights Reserved</span><br><span>@@ -32,6 +32,9 @@</span><br><span> -define(IPAC_MSGT_ID_RESP, 5).</span><br><span> -define(IPAC_MSGT_ID_ACK, 6).</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+-define(IPAC_PROTO_OSMO, 238).</span><br><span style="color: hsl(120, 100%, 40%);">+-define(IPAC_PROTO_CCM, 254).</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> -export([register_socket/1, register_stream/3, unregister_stream/2,</span><br><span> send/3, connect/3, connect/4, listen_accept_handle/2,</span><br><span> start_listen/3, controlling_process/3]).</span><br><span>@@ -136,8 +139,11 @@</span><br><span> process_rx_ipa_msg(S, StreamMap, Data) -></span><br><span> {StreamID, PayloadBin, Trailer} = split_ipa_msg(Data),</span><br><span> case StreamID of</span><br><span style="color: hsl(0, 100%, 40%);">- 254 -></span><br><span style="color: hsl(120, 100%, 40%);">+ ?IPAC_PROTO_CCM -></span><br><span> process_rx_ccm_msg(S, StreamID, PayloadBin);</span><br><span style="color: hsl(120, 100%, 40%);">+ ?IPAC_PROTO_OSMO -></span><br><span style="color: hsl(120, 100%, 40%);">+ <<ExtStreamID:8, PayloadExt/binary>> = PayloadBin,</span><br><span style="color: hsl(120, 100%, 40%);">+ deliver_rx_ipa_msg(S, {osmo, ExtStreamID}, StreamMap, PayloadExt);</span><br><span> _ -></span><br><span> deliver_rx_ipa_msg(S, StreamID, StreamMap, PayloadBin)</span><br><span> end,</span><br><span>@@ -166,8 +172,10 @@</span><br><span> ok.</span><br><span> </span><br><span> % send a binary message through a given Socket / StreamID</span><br><span style="color: hsl(120, 100%, 40%);">+send(Socket, {osmo, StreamIdExt}, DataBin) -></span><br><span style="color: hsl(120, 100%, 40%);">+ send(Socket, ?IPAC_PROTO_OSMO, [StreamIdExt, DataBin]);</span><br><span> send(Socket, StreamID, DataBin) -></span><br><span style="color: hsl(0, 100%, 40%);">- Size = byte_size(DataBin),</span><br><span style="color: hsl(120, 100%, 40%);">+ Size = iolist_size(DataBin),</span><br><span> gen_tcp:send(Socket, iolist_to_binary([<<Size:2/big-unsigned-integer-unit:8>>, StreamID, DataBin])).</span><br><span> </span><br><span> </span><br><span>@@ -244,7 +252,7 @@</span><br><span> process_ccm_msg(Socket, StreamID, MsgType, Opts).</span><br><span> </span><br><span> send_ccm_id_get(Socket) -></span><br><span style="color: hsl(0, 100%, 40%);">- send(Socket, 254, <<?IPAC_MSGT_ID_GET>>).</span><br><span style="color: hsl(120, 100%, 40%);">+ send(Socket, ?IPAC_PROTO_CCM, <<?IPAC_MSGT_ID_GET>>).</span><br><span> </span><br><span> % convenience wrapper for interactive use / debugging from the shell</span><br><span> listen_accept_handle(LPort, Opts) -></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/erlang/osmo_ss7/+/19805">change 19805</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/c/erlang/osmo_ss7/+/19805"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: erlang/osmo_ss7 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I765e0d96523feec401d6fb04693189281c580d04 </div>
<div style="display:none"> Gerrit-Change-Number: 19805 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>