<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcap/+/25131">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  dexter: Looks good to me, approved
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Change default ports of client, server<br><br>Resolve conflict with other Osmocom software by moving ports:<br><br>osmo-pcap-client 4237 -> 4227<br>osmo-pcap-server 4238 -> 4228<br><br>Notably the defines OSMO_VTY_PORT_PCAP_CLIENT and _SERVER are currently<br>not provided by libosmocore, but will be added with the related commit.<br><br>Related: OS#5203<br>Related: libosmocore I098f211370bba61995ce424ab64029bdd4c49e2d<br>Change-Id: I3b18b1fbbca2799f868f28104e2f5d513f93d46c<br>---<br>M include/osmo-pcap/common.h<br>M osmoappdesc.py<br>2 files changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-pcap/common.h b/include/osmo-pcap/common.h</span><br><span>index 79080a2..7ac5bb0 100644</span><br><span>--- a/include/osmo-pcap/common.h</span><br><span>+++ b/include/osmo-pcap/common.h</span><br><span>@@ -32,10 +32,10 @@</span><br><span> </span><br><span> /* support old versions of libosmocore */</span><br><span> #ifndef OSMO_VTY_PORT_PCAP_CLIENT</span><br><span style="color: hsl(0, 100%, 40%);">-#define OSMO_VTY_PORT_PCAP_CLIENT   4237</span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMO_VTY_PORT_PCAP_CLIENT 4227</span><br><span> #endif</span><br><span> #ifndef OSMO_VTY_PORT_PCAP_SERVER</span><br><span style="color: hsl(0, 100%, 40%);">-#define OSMO_VTY_PORT_PCAP_SERVER    4238</span><br><span style="color: hsl(120, 100%, 40%);">+#define OSMO_VTY_PORT_PCAP_SERVER 4228</span><br><span> #endif</span><br><span> </span><br><span> enum {</span><br><span>diff --git a/osmoappdesc.py b/osmoappdesc.py</span><br><span>index 331e6a9..36fef63 100644</span><br><span>--- a/osmoappdesc.py</span><br><span>+++ b/osmoappdesc.py</span><br><span>@@ -22,8 +22,8 @@</span><br><span> }</span><br><span> </span><br><span> apps = [</span><br><span style="color: hsl(0, 100%, 40%);">-    (4238, "src/osmo-pcap-server", "OsmoPCAPServer", "osmo-pcap-server"),</span><br><span style="color: hsl(0, 100%, 40%);">-    (4237, "src/osmo-pcap-client", "OsmoPCAPClient", "osmo-pcap-client"),</span><br><span style="color: hsl(120, 100%, 40%);">+    (4228, "src/osmo-pcap-server", "OsmoPCAPServer", "osmo-pcap-server"),</span><br><span style="color: hsl(120, 100%, 40%);">+    (4227, "src/osmo-pcap-client", "OsmoPCAPClient", "osmo-pcap-client"),</span><br><span>         ]</span><br><span> </span><br><span> vty_command = ["src/osmo-pcap-server", "-c", "doc/examples/osmo-pcap-server/osmo-pcap-server.cfg"]</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcap/+/25131">change 25131</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/osmo-pcap/+/25131"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcap </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3b18b1fbbca2799f868f28104e2f5d513f93d46c </div>
<div style="display:none"> Gerrit-Change-Number: 25131 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>