<div dir="ltr"><div><div><div><div><span id="result_box" class="" lang="en"><span class="">Happy New Year to</span> <span class="">all lists members</span><span>!<br><br>This patch fixes two bugs in mobile app:<br></span></span></div><span id="result_box" class="" lang="en"><span>1) If SAP connection fails mobile app does not save the sap-socket param in mobile.cfg.<br></span></span></div><span id="result_box" class="" lang="en"><span>2) The write command saves two unreadable strings:<br>    gpsd host HOST<br>    gpsd port PORT<br><br></span></span></div><span id="result_box" class="" lang="en"><span>    instead of:<br>    gpsd host HOST:PORT<br><br></span></span></div><span id="result_box" class="" lang="en"><span>Patch source:<br>diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h<br>index bf19356..e4e64ce 100644<br>--- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h<br>+++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h<br>@@ -11,6 +11,7 @@ int osmosap_sapsocket(struct osmocom_ms *ms, const char *path);<br> int osmosap_init(struct osmocom_ms *ms);<br> <br> enum osmosap_state {<br>+    SAP_SOCKET_ERROR,<br>     SAP_NOT_CONNECTED,<br>     SAP_IDLE,<br>     SAP_CONNECTION_UNDER_NEGOTIATION,<br>diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c<br>index a56f4f2..33bfa6c 100644<br>--- a/src/host/layer23/src/common/sap_interface.c<br>+++ b/src/host/layer23/src/common/sap_interface.c<br>@@ -515,7 +515,8 @@ int sap_open(struct osmocom_ms *ms, const char *socket_path)<br>     rc = connect(ms->sap_wq.bfd.fd, (struct sockaddr *) &local, sizeof(local));<br>     if (rc < 0) {<br>         fprintf(stderr, "Failed to connect to '%s'\n", local.sun_path);<br>-        set->sap_socket_path[0] = 0;<br>+        // set->sap_socket_path[0] = 0;<br>+        ms->sap_entity.sap_state == SAP_SOCKET_ERROR;<br>         close(ms->sap_wq.bfd.fd);<br>         return rc;<br>     }<br>diff --git a/src/host/layer23/src/common/sim.c b/src/host/layer23/src/common/sim.c<br>index 8e8d7bf..df9fbd2 100644<br>--- a/src/host/layer23/src/common/sim.c<br>+++ b/src/host/layer23/src/common/sim.c<br>@@ -188,7 +188,7 @@ static int sim_apdu_send(struct osmocom_ms *ms, uint8_t *data, uint16_t length)<br> <br>     /* adding SAP client support<br>      * it makes more sense to do it here then in L1CTL */<br>-    if(ms->settings.sap_socket_path[0] == 0) {<br>+    if(ms->sap_entity.sap_state == SAP_SOCKET_ERROR) {<br>         LOGP(DSIM, LOGL_INFO, "Using built-in SIM reader\n");<br>         l1ctl_tx_sim_req(ms, data, length);<br>     } else {<br>diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c<br>index 5782a17..9ac2221 100644<br>--- a/src/host/layer23/src/mobile/vty_interface.c<br>+++ b/src/host/layer23/src/mobile/vty_interface.c<br>@@ -1067,7 +1067,7 @@ DEFUN(cfg_no_gps_enable, cfg_no_gps_enable_cmd, "no gps enable",<br> }<br> <br> #ifdef _HAVE_GPSD<br>-DEFUN(cfg_gps_host, cfg_gps_host_cmd, "gps host HOST:PORT",<br>+DEFUN(cfg_gps_host, cfg_gps_host_cmd, "gpsd host HOST:PORT",<br>     "GPS receiver\nSelect gpsd host and port\n"<br>     "IP and port (optional) of the host running gpsd")<br> {<br>@@ -1499,8 +1499,7 @@ static int config_write(struct vty *vty)<br>     struct osmocom_ms *ms;<br> <br> #ifdef _HAVE_GPSD<br>-    vty_out(vty, "gpsd host %s%s", g.gpsd_host, VTY_NEWLINE);<br>-    vty_out(vty, "gpsd port %s%s", g.gpsd_port, VTY_NEWLINE);<br>+    vty_out(vty, "gpsd host %s:%s%s", g.gpsd_host, g.gpsd_port, VTY_NEWLINE);<br> #endif<br>     vty_out(vty, "gps device %s%s", g.device, VTY_NEWLINE);<br>     if (g.baud)<br><br></span></span></div>