commit 25a60750442f29a622488e4543acaca199c07051
author Harald Welte <laforge@gnumonks.org> Fri Sep 06 23:08:23 2019 +0200
committer Harald Welte <laforge@gnumonks.org> Fri Sep 06 23:09:05 2019 +0200
tree 779b20198969c0772b4bfa03ced85dda2e741a78
parent 11b734cb10a471d6d6b4c0f69af841043be89e6d

CBSP: Fix receive templates if channel_ind == omit

Change-Id: I6e15a7499b5da6f63a517f303576a877ea038788

library/CBSP_Templates.ttcn

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);
 }