<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/26229">View Change</a></p><div style="white-space:pre-wrap">Approvals:
tnt: Looks good to me, but someone else must approve
dexter: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lapd: don't add parenthesis around datalink name<br><br>The name [printing] works like this:<br><br>* libosmo-abis:lapd tells libosmogsm:lapd_core a name for each data link<br>* libosmgsm:lapd_core assumes this name has no paranthesis and puts additional<br> parenthesis around it in macros like LOGDL<br><br>However, current libosmo-abis:lapd [before this patch] adds its own set<br>of parenthesis, causing all ISDN-LAPD related log messages generated by<br>libosmgsm:lapd_core to have double-parenthesis.<br><br>So we have to remove the parenthesis from lapd_datalink.name and<br>lapd_instance.name to fix the log lines printed in libosmocore.<br><br>This in turn means we have to add parenthesis to some log statements<br>here in libosmo-abis:lapd.<br><br>Why can't we instead modify libosmogsm:lapd_core to drop parenthesis<br>there? Becaus it is also used by LAPDm code in osmo-bts, and those two<br>get it right :)<br><br>Change-Id: I688cf2a73a8c31cb3cf66ec005d02a14de197008<br>Related: Ie6742843fff809edffcac24c4dce4edf66bc71be<br>Related: OS#1938<br>---<br>M src/input/lapd.c<br>1 file changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/input/lapd.c b/src/input/lapd.c</span><br><span>index d8c67e4..6f1e270 100644</span><br><span>--- a/src/input/lapd.c</span><br><span>+++ b/src/input/lapd.c</span><br><span>@@ -74,13 +74,13 @@</span><br><span> #define LAPD_SET_K(n, o) {n,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}</span><br><span> </span><br><span> #define LOGLI(li, level, fmt, args ...) \</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLLAPD, level, "%s: " fmt, (li)->name, ## args)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLLAPD, level, "(%s): " fmt, (li)->name, ## args)</span><br><span> </span><br><span> #define LOGTEI(teip, level, fmt, args ...) \</span><br><span> LOGP(DLLAPD, level, "(%s-T%u): " fmt, (teip)->li->name, (teip)->tei, ## args)</span><br><span> </span><br><span> #define LOGSAP(sap, level, fmt, args ...) \</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLLAPD, level, "%s: " fmt, (sap)->dl.name, ## args)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLLAPD, level, "(%s): " fmt, (sap)->dl.name, ## args)</span><br><span> </span><br><span> #define DLSAP_MSGB_SIZE 128</span><br><span> #define DLSAP_MSGB_HEADROOM 56</span><br><span>@@ -240,14 +240,14 @@</span><br><span> char name[256];</span><br><span> int k;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(name, sizeof(name), "(%s-T%u-S%u)", li->name, teip->tei, sapi);</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(name, sizeof(name), "%s-T%u-S%u", li->name, teip->tei, sapi);</span><br><span> </span><br><span> sap = talloc_zero(teip, struct lapd_sap);</span><br><span> if (!sap)</span><br><span> return NULL;</span><br><span> </span><br><span> LOGP(DLLAPD, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s: LAPD Allocating SAP for SAPI=%u / TEI=%u (dl=%p, sap=%p)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ "(%s): LAPD Allocating SAP for SAPI=%u / TEI=%u (dl=%p, sap=%p)\n",</span><br><span> name, sapi, teip->tei, &sap->dl, sap);</span><br><span> </span><br><span> sap->sapi = sapi;</span><br><span>@@ -256,7 +256,7 @@</span><br><span> profile = &li->profile;</span><br><span> </span><br><span> k = profile->k[sapi & 0x3f];</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLLAPD, LOGL_NOTICE, "%s: k=%d N200=%d N201=%d T200=%d.%d T203=%d.%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLLAPD, LOGL_NOTICE, "(%s): k=%d N200=%d N201=%d T200=%d.%d T203=%d.%d\n",</span><br><span> name, k, profile->n200, profile->n201, profile->t200_sec,</span><br><span> profile->t200_usec, profile->t203_sec, profile->t203_usec);</span><br><span> lapd_dl_init2(dl, k, 128, profile->n201, name);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/26229">change 26229</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/libosmo-abis/+/26229"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-abis </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I688cf2a73a8c31cb3cf66ec005d02a14de197008 </div>
<div style="display:none"> Gerrit-Change-Number: 26229 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>