<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/21594">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ipc-driver-test: Allow setting dir prefix for UD socket<br><br>Change-Id: I35282b38a1d560fb3440fe0aa9a27808d9d116cc<br>---<br>M Transceiver52M/device/ipc/ipc-driver-test.c<br>M Transceiver52M/device/ipc/shm.h<br>2 files changed, 24 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/device/ipc/ipc-driver-test.c b/Transceiver52M/device/ipc/ipc-driver-test.c</span><br><span>index da53463..d8284c7 100644</span><br><span>--- a/Transceiver52M/device/ipc/ipc-driver-test.c</span><br><span>+++ b/Transceiver52M/device/ipc/ipc-driver-test.c</span><br><span>@@ -49,6 +49,7 @@</span><br><span> #include "ipc_sock.h"</span><br><span> </span><br><span> #define DEFAULT_SHM_NAME "/osmo-trx-ipc-driver-shm2"</span><br><span style="color: hsl(120, 100%, 40%);">+#define IPC_SOCK_PATH_PREFIX "/tmp"</span><br><span> </span><br><span> static void *tall_ctx;</span><br><span> struct ipc_sock_state *global_ipc_sock_state;</span><br><span>@@ -63,6 +64,11 @@</span><br><span> </span><br><span> static struct ipc_shm_region *decoded_region;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ int msocknum;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *ud_prefix_dir;</span><br><span style="color: hsl(120, 100%, 40%);">+} cmdline_cfg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static const struct log_info_cat default_categories[] = {</span><br><span> [DMAIN] = {</span><br><span> .name = "DMAIN",</span><br><span>@@ -185,8 +191,8 @@</span><br><span> </span><br><span> chan_info = ipc_prim->u.open_cnf.chan_info;</span><br><span> for (i = 0; i < num_chans; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(chan_info->chan_ipc_sk_path, sizeof(chan_info->chan_ipc_sk_path), "%s_%d",</span><br><span style="color: hsl(0, 100%, 40%);">- IPC_SOCK_PATH_PREFIX, i);</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(chan_info->chan_ipc_sk_path, sizeof(chan_info->chan_ipc_sk_path),"%s/ipc_sock%d_%d",</span><br><span style="color: hsl(120, 100%, 40%);">+ cmdline_cfg.ud_prefix_dir, cmdline_cfg.msocknum, i);</span><br><span> /* FIXME: dynamc chan limit, currently 8 */</span><br><span> if (i < 8)</span><br><span> ipc_sock_init(chan_info->chan_ipc_sk_path, &global_ctrl_socks[i], ipc_chan_sock_accept, i);</span><br><span>@@ -413,20 +419,20 @@</span><br><span> {</span><br><span> printf("ipc-driver-test Usage:\n"</span><br><span> " -h --help This message\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -u --unix-sk-dir DIR Existing directory where to create the Master socket\n"</span><br><span> " -n --sock-num NR Master socket suffix number NR\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int msocknum = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void handle_options(int argc, char **argv)</span><br><span> {</span><br><span> while (1) {</span><br><span> int option_index = 0, c;</span><br><span> const struct option long_options[] = { { "help", 0, 0, 'h' },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "unix-sk-dir", 1, 0, 'u' },</span><br><span> { "sock-num", 1, 0, 'n' },</span><br><span> { 0, 0, 0, 0 } };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- c = getopt_long(argc, argv, "hn:", long_options, &option_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ c = getopt_long(argc, argv, "hu:n:", long_options, &option_index);</span><br><span> if (c == -1)</span><br><span> break;</span><br><span> </span><br><span>@@ -435,9 +441,13 @@</span><br><span> print_help();</span><br><span> exit(0);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'n':</span><br><span style="color: hsl(0, 100%, 40%);">- msocknum = atoi(optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'u':</span><br><span style="color: hsl(120, 100%, 40%);">+ cmdline_cfg.ud_prefix_dir = talloc_strdup(tall_ctx, optarg);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'n':</span><br><span style="color: hsl(120, 100%, 40%);">+ cmdline_cfg.msocknum = atoi(optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> default:</span><br><span> exit(2);</span><br><span> break;</span><br><span>@@ -452,14 +462,19 @@</span><br><span> </span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- char ipc_msock_path[sizeof(IPC_SOCK_PATH_PREFIX) + 3];</span><br><span style="color: hsl(120, 100%, 40%);">+ char ipc_msock_path[128];</span><br><span> tall_ctx = talloc_named_const(NULL, 0, "OsmoTRX");</span><br><span> msgb_talloc_ctx_init(tall_ctx, 0);</span><br><span> osmo_init_logging2(tall_ctx, &log_infox);</span><br><span> log_enable_multithread();</span><br><span> </span><br><span> handle_options(argc, argv);</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(ipc_msock_path, sizeof(ipc_msock_path), "%s%d", IPC_SOCK_PATH_PREFIX, msocknum);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cmdline_cfg.ud_prefix_dir)</span><br><span style="color: hsl(120, 100%, 40%);">+ cmdline_cfg.ud_prefix_dir = talloc_strdup(tall_ctx, IPC_SOCK_PATH_PREFIX);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(ipc_msock_path, sizeof(ipc_msock_path), "%s/ipc_sock%d", cmdline_cfg.ud_prefix_dir, cmdline_cfg.msocknum);</span><br><span> </span><br><span> LOGP(DMAIN, LOGL_INFO, "Starting %s\n", argv[0]);</span><br><span> ipc_sock_init(ipc_msock_path, &global_ipc_sock_state, ipc_sock_accept, 0);</span><br><span>diff --git a/Transceiver52M/device/ipc/shm.h b/Transceiver52M/device/ipc/shm.h</span><br><span>index fcddd54..46c3add 100644</span><br><span>--- a/Transceiver52M/device/ipc/shm.h</span><br><span>+++ b/Transceiver52M/device/ipc/shm.h</span><br><span>@@ -79,8 +79,6 @@</span><br><span> //////////////////</span><br><span> // Master socket</span><br><span> //////////////////</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define IPC_SOCK_PATH_PREFIX "/tmp/ipc_sock"</span><br><span> #define IPC_SOCK_API_VERSION 1</span><br><span> </span><br><span> /* msg_type */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/21594">change 21594</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-trx/+/21594"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I35282b38a1d560fb3440fe0aa9a27808d9d116cc </div>
<div style="display:none"> Gerrit-Change-Number: 21594 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de> </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>