aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-03-30 15:41:03 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-04-05 22:01:20 +0200
commit13d67b7ea331fdc6a0ef271a5839221c44f2d0d5 (patch)
treeaeabfce7b8e94f0adf5eee45d12455d6d3ae618e
parent95e4d34f06567521087121fb5fbdc0f9c9d48ae7 (diff)
[mgcp] Remove the sending of RSIP
This message is ignored by the call agent and we were sending this on the first request which we maybe should not ignore...
-rw-r--r--openbsc/include/openbsc/mgcp.h1
-rw-r--r--openbsc/src/mgcp/mgcp_main.c13
-rw-r--r--openbsc/src/mgcp/mgcp_protocol.c17
3 files changed, 0 insertions, 31 deletions
diff --git a/openbsc/include/openbsc/mgcp.h b/openbsc/include/openbsc/mgcp.h
index f7e800bd8..6a07cd111 100644
--- a/openbsc/include/openbsc/mgcp.h
+++ b/openbsc/include/openbsc/mgcp.h
@@ -115,7 +115,6 @@ void mgcp_free_endp(struct mgcp_endpoint *endp);
* format helper functions
*/
struct msgb *mgcp_handle_message(struct mgcp_config *cfg, struct msgb *msg);
-struct msgb *mgcp_create_rsip(void);
struct msgb *mgcp_create_response_with_data(int code, const char *msg, const char *trans, const char *data);
diff --git a/openbsc/src/mgcp/mgcp_main.c b/openbsc/src/mgcp/mgcp_main.c
index 6210e5941..23e66a917 100644
--- a/openbsc/src/mgcp/mgcp_main.c
+++ b/openbsc/src/mgcp/mgcp_main.c
@@ -53,7 +53,6 @@ void subscr_put() { abort(); }
#warning "Make use of the rtp proxy code"
static struct bsc_fd bfd;
-static int first_request = 1;
static struct mgcp_config *cfg;
const char *openbsc_version = "OpenBSC MGCP " PACKAGE_VERSION;
const char *openbsc_copyright =
@@ -138,18 +137,6 @@ static int read_call_agent(struct bsc_fd *fd, unsigned int what)
return -1;
}
- if (first_request) {
- first_request = 0;
- resp = mgcp_create_rsip();
-
- if (resp) {
- sendto(bfd.fd, resp->l2h, msgb_l2len(resp), 0,
- (struct sockaddr *) &addr, sizeof(addr));
- msgb_free(resp);
- }
- return 0;
- }
-
/* handle message now */
msg->l2h = msgb_put(msg, rc);
resp = mgcp_handle_message(cfg, msg);
diff --git a/openbsc/src/mgcp/mgcp_protocol.c b/openbsc/src/mgcp/mgcp_protocol.c
index a825e92f5..5ae35702a 100644
--- a/openbsc/src/mgcp/mgcp_protocol.c
+++ b/openbsc/src/mgcp/mgcp_protocol.c
@@ -194,23 +194,6 @@ static struct msgb *create_response_with_sdp(struct mgcp_endpoint *endp,
return mgcp_create_response_with_data(200, msg, trans_id, sdp_record);
}
-/* send a static record */
-struct msgb *mgcp_create_rsip(void)
-{
- struct msgb *msg;
- int len;
-
- msg = mgcp_msgb_alloc();
- if (!msg)
- return NULL;
-
- len = snprintf((char *) msg->data, 2048,
- "RSIP %u *@mgw MGCP 1.0\n"
- "RM: restart\n", generate_transaction_id());
- msg->l2h = msgb_put(msg, len);
- return msg;
-}
-
/*
* handle incoming messages:
* - this can be a command (four letters, space, transaction id)