commit 90bbccfca9f00094e89dd35b42052e80a8318404
author Holger Hans Peter Freyther <zecke@selfish.org> Sat Oct 16 17:34:37 2010 +0200
committer Holger Hans Peter Freyther <zecke@selfish.org> Mon Oct 25 21:06:03 2010 +0200
tree fe74120a743afa4a1b605ea9f2e2ad55f4610ce0
parent 4c401e7a1a35d67256baaaa28f5f2965884f96c8

nat: Forward the data coming from the USSD module to the BSC.

openbsc/src/nat/bsc_ussd.c

diff --git a/openbsc/src/nat/bsc_ussd.c b/openbsc/src/nat/bsc_ussd.c
index cd40566..3729d91 100644
--- a/openbsc/src/nat/bsc_ussd.c
+++ b/openbsc/src/nat/bsc_ussd.c
@@ -70,6 +70,37 @@
 	talloc_free(con);
 }
 
+static int forward_sccp(struct bsc_nat *nat, struct msgb *msg)
+{
+	struct sccp_connections *con;
+	struct bsc_nat_parsed *parsed;
+
+
+	parsed = bsc_nat_parse(msg);
+	if (!parsed) {
+		LOGP(DNAT, LOGL_ERROR, "Can not parse msg from USSD.\n");
+		msgb_free(msg);
+		return -1;
+	}
+
+	if (!parsed->dest_local_ref) {
+		LOGP(DNAT, LOGL_ERROR, "No destination local reference.\n");
+		msgb_free(msg);
+		return -1;
+	}
+
+	con = bsc_nat_find_con_by_bsc(nat, parsed->dest_local_ref);
+	if (!con || !con->bsc) {
+		LOGP(DNAT, LOGL_ERROR, "No active connection found.\n");
+		msgb_free(msg);
+		return -1;
+	}
+
+	talloc_free(parsed);
+	bsc_write_msg(&con->bsc->write_queue, msg);
+	return 0;
+}
+
 static int ussd_read_cb(struct bsc_fd *bfd)
 {
 	int error;
@@ -99,8 +130,7 @@
 
 		msgb_free(msg);
 	} else if (hh->proto == IPAC_PROTO_SCCP) {
-		LOGP(DNAT, LOGL_ERROR, "USSD SCCP is not handled\n");
-		msgb_free(msg);
+		forward_sccp(conn->nat, msg);
 	} else {
 		msgb_free(msg);
 	}
@@ -225,7 +255,7 @@
 static int forward_ussd(struct sccp_connections *con, const struct ussd_request *req,
 			struct msgb *input)
 {
-	struct msgb *msg;
+	struct msgb *msg, *copy;
 	struct ipac_msgt_sccp_state *state;
 	struct bsc_nat_ussd_con *ussd;
 
@@ -238,6 +268,16 @@
 		return -1;
 	}
 
+	copy = msgb_alloc_headroom(4096, 128, "forward bts");
+	if (!copy) {
+		LOGP(DNAT, LOGL_ERROR, "Allocation failed, not forwarding.\n");
+		msgb_free(msg);
+		return -1;
+	}
+
+	copy->l2h = msgb_put(copy, msgb_l2len(input));
+	memcpy(copy->l2h, input->l2h, msgb_l2len(input));
+
 	msg->l2h = msgb_put(msg, 1);
 	msg->l2h[0] = IPAC_MSGT_SCCP_STATE;
 
@@ -251,6 +291,7 @@
 
 	ussd = con->bsc->nat->ussd_con;
 	bsc_do_write(&ussd->queue, msg, IPAC_PROTO_IPACCESS);
+	bsc_do_write(&ussd->queue, copy, IPAC_PROTO_SCCP);
 
 	return 0;
 }