<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10292">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "ipa: Properly parse LV stream of a ID_GET request"<br><br>This reverts commit f558ed4bb9c0f00997b8f97c2b251a574c1a64c4.<br><br>It introduced a function/behavior that was not originally intended:<br>The parse of IPA CCM ID GET (8bit length followed by 1 byte tag<br>and variable-length payload) instead of the IPA CCM ID RESP (16bit<br>length followed by 1 byte tag and variable-length payload).<br><br>Change-Id: I0b964140a43ab39351be0d9c710b8ef2e87a5d9a<br>---<br>M src/gsm/ipa.c<br>1 file changed, 3 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/92/10292/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c</span><br><span>index aecde83..989e439 100644</span><br><span>--- a/src/gsm/ipa.c</span><br><span>+++ b/src/gsm/ipa.c</span><br><span>@@ -100,11 +100,6 @@</span><br><span> </span><br><span> int ipa_ccm_idtag_parse(struct tlv_parsed *dec, unsigned char *buf, int len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return ipa_ccm_idtag_parse_off(dec, buf, len, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int ipa_ccm_idtag_parse_off(struct tlv_parsed *dec, unsigned char *buf, int len, const int len_offset)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span> uint8_t t_len;</span><br><span> uint8_t t_tag;</span><br><span> uint8_t *cur = buf;</span><br><span>@@ -116,11 +111,6 @@</span><br><span> t_len = *cur++;</span><br><span> t_tag = *cur++;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (t_len < len_offset) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMI, LOGL_ERROR, "minimal offset not included: %d < %d\n", t_len, len_offset);</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (t_len > len + 1) {</span><br><span> LOGP(DLMI, LOGL_ERROR, "The tag does not fit: %d > %d\n", t_len, len + 1);</span><br><span> return -EINVAL;</span><br><span>@@ -128,11 +118,11 @@</span><br><span> </span><br><span> DEBUGPC(DLMI, "%s='%s' ", ipa_ccm_idtag_name(t_tag), cur);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- dec->lv[t_tag].len = t_len - len_offset;</span><br><span style="color: hsl(120, 100%, 40%);">+ dec->lv[t_tag].len = t_len;</span><br><span> dec->lv[t_tag].val = cur;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cur += t_len - len_offset;</span><br><span style="color: hsl(0, 100%, 40%);">- len -= t_len - len_offset;</span><br><span style="color: hsl(120, 100%, 40%);">+ cur += t_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ len -= t_len;</span><br><span> }</span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10292">change 10292</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/10292"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0b964140a43ab39351be0d9c710b8ef2e87a5d9a </div>
<div style="display:none"> Gerrit-Change-Number: 10292 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>