[MERGED] openbsc[master]: silent_call: remove unfinished fuzzer interface

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: silent_call: remove unfinished fuzzer interface
......................................................................


silent_call: remove unfinished fuzzer interface

Remove the fuzzer interface that was partially implemented in
gsm_04_08.c and silent_call.c is causing problems when an
SMS is sent during an active silent call. The reason for this
is that gsm0408_dispatch() in gsm_04_08.c would decide to
rout all uplink traffic to silent_call_rx() in silent_call.c.
silent_call_rx() is a stub function that discards the data.

This patch removes the fuzzer interface code by placing ifdefs
around it, so that it can be re-activated by experimentators.

Change-Id: Id500197d58663b3f4b1756136343670388b0a4bc
---
M openbsc/include/openbsc/silent_call.h
M openbsc/src/libmsc/gsm_04_08.c
M openbsc/src/libmsc/silent_call.c
3 files changed, 9 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/openbsc/include/openbsc/silent_call.h b/openbsc/include/openbsc/silent_call.h
index 2492903..619a543 100644
--- a/openbsc/include/openbsc/silent_call.h
+++ b/openbsc/include/openbsc/silent_call.h
@@ -6,7 +6,10 @@
 extern int gsm_silent_call_start(struct gsm_subscriber *subscr,
                                  void *data, int type);
 extern int gsm_silent_call_stop(struct gsm_subscriber *subscr);
+
+#if 0
 extern int silent_call_rx(struct gsm_subscriber_connection *conn, struct msgb *msg);
 extern int silent_call_reroute(struct gsm_subscriber_connection *conn, struct msgb *msg);
+#endif
 
 #endif /* _SILENT_CALL_H */
diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c
index be43956..3cc86ba 100644
--- a/openbsc/src/libmsc/gsm_04_08.c
+++ b/openbsc/src/libmsc/gsm_04_08.c
@@ -3958,8 +3958,10 @@
 	OSMO_ASSERT(msg);
 
 	LOGP(DRLL, LOGL_DEBUG, "Dispatching 04.08 message, pdisc=%d\n", pdisc);
+#if 0
 	if (silent_call_reroute(conn, msg))
 		return silent_call_rx(conn, msg);
+#endif
 
 	switch (pdisc) {
 	case GSM48_PDISC_CC:
diff --git a/openbsc/src/libmsc/silent_call.c b/openbsc/src/libmsc/silent_call.c
index 131a178..590d01b 100644
--- a/openbsc/src/libmsc/silent_call.c
+++ b/openbsc/src/libmsc/silent_call.c
@@ -72,6 +72,7 @@
 	return rc;
 }
 
+#if 0
 /* receive a layer 3 message from a silent call */
 int silent_call_rx(struct gsm_subscriber_connection *conn, struct msgb *msg)
 {
@@ -79,6 +80,7 @@
 	LOGP(DLSMS, LOGL_NOTICE, "Discarding L3 message from a silent call.\n");
 	return 0;
 }
+#endif
 
 struct msg_match {
 	uint8_t pdisc;
@@ -91,6 +93,7 @@
 	{ GSM48_PDISC_MM, GSM48_MT_MM_CM_SERV_REQ },
 };
 
+#if 0
 /* decide if we need to reroute a message as part of a silent call */
 int silent_call_reroute(struct gsm_subscriber_connection *conn, struct msgb *msg)
 {
@@ -114,6 +117,7 @@
 	LOGP(DLSMS, LOGL_INFO, "Rerouting L3 message from a silent call.\n");
 	return 1;
 }
+#endif
 
 
 /* initiate a silent call with a given subscriber */

-- 
To view, visit https://gerrit.osmocom.org/1930
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id500197d58663b3f4b1756136343670388b0a4bc
Gerrit-PatchSet: 2
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder