<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9980">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nat: ctrl: Avoid sending back received ERROR msgs<br><br>We only send back if we had an error parsing the message locally. If we<br>receive an ERROR message from a bsc, we try to forward it if the ID is<br>valid, otherwise only log the received error description locally.<br><br>Related: OS#3394<br><br>Change-Id: I7b4d20aea7a16c4b4e5add7c274a4ed34a7f6b8d<br>---<br>M openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c<br>1 file changed, 11 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/80/9980/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c</span><br><span>index e244827..e806731 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c</span><br><span>@@ -101,13 +101,14 @@</span><br><span> int bsc_nat_handle_ctrlif_msg(struct bsc_connection *bsc, struct msgb *msg)</span><br><span> {</span><br><span>       struct ctrl_cmd *cmd;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool parse_failed;</span><br><span>   struct bsc_cmd_list *pending;</span><br><span>        char *var;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  cmd = ctrl_cmd_parse2(bsc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+      cmd = ctrl_cmd_parse3(bsc, msg, &parse_failed);</span><br><span>  msgb_free(msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     if (cmd->type == CTRL_TYPE_ERROR)</span><br><span style="color: hsl(120, 100%, 40%);">+  if (cmd->type == CTRL_TYPE_ERROR && parse_failed)</span><br><span>                 goto err;</span><br><span> </span><br><span>        if (bsc->cfg && !llist_empty(&bsc->cfg->lac_list)) {</span><br><span>@@ -142,11 +143,14 @@</span><br><span>                    ctrl_cmd_send(&pending->cmd->ccon->write_queue, cmd);</span><br><span>                   bsc_nat_ctrl_del_pending(pending);</span><br><span>           } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                        /* We need to handle TRAPS here */</span><br><span style="color: hsl(0, 100%, 40%);">-                      if ((cmd->type != CTRL_TYPE_ERROR) &&</span><br><span style="color: hsl(0, 100%, 40%);">-                            (cmd->type != CTRL_TYPE_TRAP)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                         LOGP(DNAT, LOGL_NOTICE, "Got control message "</span><br><span style="color: hsl(0, 100%, 40%);">-                                        "from BSC without pending entry\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                        if ((cmd->type == CTRL_TYPE_ERROR)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                              LOGP(DNAT, LOGL_NOTICE, "Got ERROR CTRL message "</span><br><span style="color: hsl(120, 100%, 40%);">+                                "from BSC without pending/valid ID %s: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                               cmd->id, cmd->reply);</span><br><span style="color: hsl(120, 100%, 40%);">+                      } else {</span><br><span style="color: hsl(120, 100%, 40%);">+                              LOGP(DNAT, LOGL_NOTICE, "Got %s CTRL message "</span><br><span style="color: hsl(120, 100%, 40%);">+                                   "from BSC without pending entry\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                                 get_value_string(ctrl_type_vals, cmd->type));</span><br><span>                                cmd->type = CTRL_TYPE_ERROR;</span><br><span>                              cmd->reply = "No request outstanding";</span><br><span>                          goto err;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9980">change 9980</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/9980"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7b4d20aea7a16c4b4e5add7c274a4ed34a7f6b8d </div>
<div style="display:none"> Gerrit-Change-Number: 9980 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>