Change in ...osmo-ttcn3-hacks[master]: CBSP: Fix receive templates if channel_ind == omit

[laforge]

laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15438 )

Change subject: CBSP: Fix receive templates if channel_ind == omit
......................................................................

CBSP: Fix receive templates if channel_ind == omit

Change-Id: I6e15a7499b5da6f63a517f303576a877ea038788
---
M library/CBSP_Templates.ttcn
1 file changed, 9 insertions(+), 3 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/library/CBSP_Templates.ttcn b/library/CBSP_Templates.ttcn
index 2283e6f..7c73d7c 100644
--- a/library/CBSP_Templates.ttcn
+++ b/library/CBSP_Templates.ttcn
@@ -375,7 +375,9 @@
 	} else if (not istemplatekind(cell_list, "omit")) {
 		ies[lengthof(ies)] := tr_CbspCellList(cell_list);
 	}
-	ies[lengthof(ies)] := tr_CbspChannelInd(channel_ind);
+	if (not istemplatekind(channel_ind, "omit")) {
+		ies[lengthof(ies)] := tr_CbspChannelInd(channel_ind);
+	}
 	return tr_CBSP(CBSP_MSGT_WRITE_REPLACE_COMPL, ies);
 }
 
@@ -416,7 +418,9 @@
 	} else if (not istemplatekind(cell_list, "omit")) {
 		ies[lengthof(ies)] := tr_CbspCellList(cell_list);
 	}
-	ies[lengthof(ies)] := tr_CbspChannelInd(channel_ind);
+	if (not istemplatekind(channel_ind, "omit")) {
+		ies[lengthof(ies)] := tr_CbspChannelInd(channel_ind);
+	}
 	return tr_CBSP(CBSP_MSGT_WRITE_REPLACE_COMPL, ies);
 }
 
@@ -467,7 +471,9 @@
 	} else if (not istemplatekind(cell_list, "omit")) {
 		ies[lengthof(ies)] := tr_CbspCellList(cell_list);
 	}
-	ies[lengthof(ies)] := ts_CbspChannelInd(channel_ind);
+	if (not istemplatekind(channel_ind, "omit")) {
+		ies[lengthof(ies)] := ts_CbspChannelInd(channel_ind);
+	}
 	return tr_CBSP(CBSP_MSGT_WRITE_REPLACE_FAIL, ies);
 }
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15438
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6e15a7499b5da6f63a517f303576a877ea038788
Gerrit-Change-Number: 15438
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at gnumonks.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190906/f854d3e2/attachment.htm>