diff options
| author | Harald Welte <laforge@gnumonks.org> | 2013-02-03 16:35:07 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2013-02-04 22:16:23 +0100 |
| commit | 550d22be5b2ddc376ccae937bd34c921dcf4a071 (patch) | |
| tree | 128328e61ceeda9af398566125e41c3996a279b3 | |
| parent | 6a2d89f48d0727238eb2c14c7bfb4f0517d3be81 (diff) | |
Deprecate the "rtp bind-ip" configuration directive
Instead of explicitly having to specify the local IP address for RTP
sockets in the BTS, we just use "0.0.0.0" instead, which gets
translated to INADDR_ANY.
We still accept the configuration directive in old config files, but
when we write, the line will no longer be re-written to the file.
TODO: IMHO, the IPA RSL CRCX/MDCX actually permit the BSC to specify the
IP address on the BTS side, and we probably simply ignore this at this
point.
| -rw-r--r-- | include/osmo-bts/gsm_data.h | 1 | ||||
| -rw-r--r-- | src/common/rsl.c | 2 | ||||
| -rw-r--r-- | src/common/vty.c | 13 |
3 files changed, 4 insertions, 12 deletions
diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 1bc6c9f2..267aa52b 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -51,7 +51,6 @@ struct gsm_bts_role_bts { struct llist_head agch_queue; struct paging_state *paging_state; char *bsc_oml_host; - char *rtp_bind_host; unsigned int rtp_jitter_buf_ms; struct { uint8_t ciphers; /* flags A5/1==0x1, A5/2==0x2, A5/3==0x4 */ diff --git a/src/common/rsl.c b/src/common/rsl.c index 76f2c742..e1a8e8fc 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1264,7 +1264,7 @@ static int rsl_rx_ipac_XXcx(struct msgb *msg) lchan->abis_ip.rtp_socket->rx_cb = &bts_model_rtp_rx_cb; rc = osmo_rtp_socket_bind(lchan->abis_ip.rtp_socket, - btsb->rtp_bind_host, -1); + "0.0.0.0", -1); if (rc < 0) { LOGP(DRSL, LOGL_ERROR, "%s IPAC Failed to bind RTP/RTCP sockets\n", diff --git a/src/common/vty.c b/src/common/vty.c index e66569bc..5eddc8df 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -183,7 +183,6 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts) vty_out(vty, " ipa unit-id %u %u%s", bts->ip_access.site_id, bts->ip_access.bts_id, VTY_NEWLINE); vty_out(vty, " oml remote-ip %s%s", btsb->bsc_oml_host, VTY_NEWLINE); - vty_out(vty, " rtp bind-ip %s%s", btsb->rtp_bind_host, VTY_NEWLINE); vty_out(vty, " rtp jitter-buffer %u%s", btsb->rtp_jitter_buf_ms, VTY_NEWLINE); vty_out(vty, " paging queue-size %u%s", paging_get_queue_max(btsb->paging_state), @@ -303,20 +302,14 @@ DEFUN(cfg_bts_oml_ip, #define RTP_STR "RTP parameters\n" -DEFUN(cfg_bts_rtp_bind_ip, +DEFUN_HIDDEN(cfg_bts_rtp_bind_ip, cfg_bts_rtp_bind_ip_cmd, "rtp bind-ip A.B.C.D", RTP_STR "RTP local bind IP Address\n" "RTP local bind IP Address\n") { - struct gsm_bts *bts = vty->index; - struct gsm_bts_role_bts *btsb = bts_role_bts(bts); - - if (btsb->rtp_bind_host) - talloc_free(btsb->rtp_bind_host); + vty_out(vty, "%% rtp bind-ip is now deprecated%s", VTY_NEWLINE); - btsb->rtp_bind_host = talloc_strdup(btsb, argv[0]); - - return CMD_SUCCESS; + return CMD_WARNING; } DEFUN(cfg_bts_rtp_jitbuf, |