diff options
author | Philipp Maier <pmaier@sysmocom.de> | 2018-03-21 13:44:17 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2018-04-02 19:33:11 +0000 |
commit | c74a5616bf1c77ac40ddd92f4927dca7a1b45bc8 (patch) | |
tree | 371943a51347f1de40b1a9627ff5f5d2758e14c6 | |
parent | e34161832d936959640d5e5735dfa1ca7bccae13 (diff) |
cosmetic: remove dead code
There is a lot of dead code in osmo_bsc_msc.c that used to handle
the IPA multiplexed SSCP lite A interface.
- remove portions of the dead code
- remove IPA Ping related VTY commands
Change-Id: I5cf3fec31cc774c902f3cfe6d16fb85ef301694a
-rw-r--r-- | doc/examples/osmo-bsc/osmo-bsc.cfg | 4 | ||||
-rw-r--r-- | include/osmocom/bsc/bsc_msc_data.h | 7 | ||||
-rw-r--r-- | src/osmo-bsc/osmo_bsc_api.c | 10 | ||||
-rw-r--r-- | src/osmo-bsc/osmo_bsc_msc.c | 498 | ||||
-rw-r--r-- | src/osmo-bsc/osmo_bsc_vty.c | 74 | ||||
-rwxr-xr-x | tests/vty_test_runner.py | 41 |
6 files changed, 0 insertions, 634 deletions
diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg index 2d759cabb..2a41d8483 100644 --- a/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -78,10 +78,6 @@ network phys_chan_config TCH/F hopping enabled 0 msc 0 - ip.access rtp-base 4000 - timeout-ping 20 - timeout-pong 5 - no timeout-ping advanced no bsc-welcome-text no bsc-msc-lost-text no bsc-grace-text diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index a04e632ac..bedf41240 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -73,11 +73,6 @@ struct bsc_msc_data { /* Connection data */ - int ping_timeout; - int pong_timeout; - struct osmo_timer_list ping_timer; - struct osmo_timer_list pong_timer; - int advanced_ping; struct bsc_msc_connection *msc_con; struct osmo_plmn_id core_plmn; int core_lac; @@ -158,8 +153,6 @@ struct osmo_bsc_data { int osmo_bsc_msc_init(struct bsc_msc_data *msc); int osmo_bsc_sccp_init(struct gsm_network *gsmnet); -int msc_queue_write(struct bsc_msc_connection *conn, struct msgb *msg, int proto); -int msc_queue_write_with_ping(struct bsc_msc_connection *, struct msgb *msg, int proto); int osmo_bsc_audio_init(struct gsm_network *network); diff --git a/src/osmo-bsc/osmo_bsc_api.c b/src/osmo-bsc/osmo_bsc_api.c index b80eb584c..239bb543c 100644 --- a/src/osmo-bsc/osmo_bsc_api.c +++ b/src/osmo-bsc/osmo_bsc_api.c @@ -237,18 +237,8 @@ static int complete_layer3(struct gsm_subscriber_connection *conn, { int con_type, rc, lu_cause; char *imsi = NULL; - struct timeval tv; struct msgb *resp; enum bsc_con ret; - int send_ping = msc->advanced_ping; - - /* Advanced ping/pong handling */ - if (osmo_timer_pending(&msc->pong_timer)) - send_ping = 0; - if (msc->ping_timeout <= 0) - send_ping = 0; - if (send_ping && osmo_timer_remaining(&msc->ping_timer, NULL, &tv) == -1) - send_ping = 0; /* Check the filter */ rc = bsc_filter_initial(msc->network->bsc_data, msc, conn, msg, diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index e0c7556a9..2178d1d2c 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -40,516 +40,20 @@ #include <netinet/tcp.h> #include <unistd.h> -#if 0 -static void initialize_if_needed(struct bsc_msc_connection *conn); -static void send_lacs(struct gsm_network *net, struct bsc_msc_connection *conn); -static void send_id_get_response(struct bsc_msc_data *data, int fd, struct msgb *inp); -static void send_ping(struct bsc_msc_data *data); -static void schedule_ping_pong(struct bsc_msc_data *data); - -/* - * MGCP forwarding code - */ - -#endif -static int mgcp_do_read(struct osmo_fd *fd) -{ - struct bsc_msc_data *data = (struct bsc_msc_data *) fd->data; - struct msgb *mgcp; - int ret; - - mgcp = msgb_alloc_headroom(4096, 128, "mgcp_from_gw"); - if (!mgcp) { - LOGP(DMGCP, LOGL_ERROR, "Failed to allocate MGCP message.\n"); - return -1; - } - - ret = read(fd->fd, mgcp->data, 4096 - 128); - if (ret <= 0) { - LOGP(DMGCP, LOGL_ERROR, "Failed to read: %d/%s\n", errno, strerror(errno)); - msgb_free(mgcp); - return -1; - } else if (ret > 4096 - 128) { - LOGP(DMGCP, LOGL_ERROR, "Too much data: %d\n", ret); - msgb_free(mgcp); - return -1; - } - - mgcp->l2h = msgb_put(mgcp, ret); - msc_queue_write(data->msc_con, mgcp, IPAC_PROTO_MGCP_OLD); - return 0; -} - -static int mgcp_do_write(struct osmo_fd *fd, struct msgb *msg) -{ - int ret; - - LOGP(DMGCP, LOGL_DEBUG, "Sending msg to MGCP GW size: %u\n", msg->len); - - ret = write(fd->fd, msg->data, msg->len); - if (ret != msg->len) - LOGP(DMGCP, LOGL_ERROR, "Failed to forward message to MGCP GW (%s).\n", strerror(errno)); - - return ret; -} - -#if 0 -static void mgcp_forward(struct bsc_msc_data *data, struct msgb *msg) -{ - struct msgb *mgcp; - - if (msgb_l2len(msg) > 4096) { - LOGP(DMGCP, LOGL_ERROR, "Can not forward too big message.\n"); - return; - } - - mgcp = msgb_alloc(4096, "mgcp_to_gw"); - if (!mgcp) { - LOGP(DMGCP, LOGL_ERROR, "Failed to send message.\n"); - return; - } - - msgb_put(mgcp, msgb_l2len(msg)); - memcpy(mgcp->data, msg->l2h, mgcp->len); - if (osmo_wqueue_enqueue(&data->mgcp_agent, mgcp) != 0) { - LOGP(DMGCP, LOGL_FATAL, "Could not queue message to MGCP GW.\n"); - msgb_free(mgcp); - } -} -#endif - -static int mgcp_create_port(struct bsc_msc_data *data) -{ - int on; - struct sockaddr_in addr; - - data->mgcp_agent.bfd.fd = socket(AF_INET, SOCK_DGRAM, 0); - if (data->mgcp_agent.bfd.fd < 0) { - LOGP(DMGCP, LOGL_FATAL, "Failed to create UDP socket errno: %d\n", errno); - return -1; - } - - on = 1; - setsockopt(data->mgcp_agent.bfd.fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); - - /* try to bind the socket */ - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - addr.sin_port = 0; - - if (bind(data->mgcp_agent.bfd.fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) { - LOGP(DMGCP, LOGL_FATAL, "Failed to bind to any port.\n"); - close(data->mgcp_agent.bfd.fd); - data->mgcp_agent.bfd.fd = -1; - return -1; - } - - /* connect to the remote */ - addr.sin_port = htons(2427); - if (connect(data->mgcp_agent.bfd.fd, (struct sockaddr *) & addr, sizeof(addr)) < 0) { - LOGP(DMGCP, LOGL_FATAL, "Failed to connect to local MGCP GW. %s\n", strerror(errno)); - close(data->mgcp_agent.bfd.fd); - data->mgcp_agent.bfd.fd = -1; - return -1; - } - - osmo_wqueue_init(&data->mgcp_agent, 10); - data->mgcp_agent.bfd.when = BSC_FD_READ; - data->mgcp_agent.bfd.data = data; - data->mgcp_agent.read_cb = mgcp_do_read; - data->mgcp_agent.write_cb = mgcp_do_write; - - if (osmo_fd_register(&data->mgcp_agent.bfd) != 0) { - LOGP(DMGCP, LOGL_FATAL, "Failed to register BFD\n"); - close(data->mgcp_agent.bfd.fd); - data->mgcp_agent.bfd.fd = -1; - return -1; - } - - return 0; -} - - -/* - * Send data to the network - */ -int msc_queue_write(struct bsc_msc_connection *conn, struct msgb *msg, int proto) -{ - ipa_prepend_header(msg, proto); - if (osmo_wqueue_enqueue(&conn->write_queue, msg) != 0) { - LOGP(DMSC, LOGL_FATAL, "Failed to queue IPA/%d\n", proto); - msgb_free(msg); - return -1; - } - - return 0; -} - -#if 0 -int msc_queue_write_with_ping(struct bsc_msc_connection *conn, - struct msgb *msg, int proto) -{ - struct bsc_msc_data *data; - uint8_t val; - - /* prepend the header */ - ipa_prepend_header(msg, proto); - if (osmo_wqueue_enqueue(&conn->write_queue, msg) != 0) { - LOGP(DMSC, LOGL_FATAL, "Failed to queue IPA/%d\n", proto); - msgb_free(msg); - return -1; - } - - /* add the ping as the other message */ - val = IPAC_MSGT_PING; - msgb_l16tv_put(msg, 1, IPAC_PROTO_IPACCESS, &val); - - data = (struct bsc_msc_data *) conn->write_queue.bfd.data; - schedule_ping_pong(data); - return 0; -} - -static int msc_alink_do_write(struct osmo_fd *fd, struct msgb *msg) -{ - int ret; - - LOGP(DMSC, LOGL_DEBUG, "Sending SCCP to MSC: %u\n", msgb_l2len(msg)); - LOGP(DLMI, LOGL_DEBUG, "MSC TX %s\n", osmo_hexdump(msg->data, msg->len)); - - ret = write(fd->fd, msg->data, msg->len); - if (ret < msg->len) - perror("MSC: Failed to send SCCP"); - - return ret; -} - -static void handle_ctrl(struct bsc_msc_data *msc, struct msgb *msg) -{ - int ret; - struct ctrl_cmd *cmd; - - cmd = ctrl_cmd_parse(msc->msc_con, msg); - if (!cmd) { - LOGP(DMSC, LOGL_ERROR, "Failed to parse control message.\n"); - cmd = talloc_zero(msc->msc_con, struct ctrl_cmd); - if (!cmd) { - LOGP(DMSC, LOGL_ERROR, "OOM!\n"); - return; - } - cmd->type = CTRL_TYPE_ERROR; - cmd->id = "err"; - cmd->reply = "Failed to parse control message."; - - ctrl_cmd_send(&msc->msc_con->write_queue, cmd); - talloc_free(cmd); - - return; - } - - ret = ctrl_cmd_handle(msc->network->ctrl, cmd, msc->network); - if (ret != CTRL_CMD_HANDLED) - ctrl_cmd_send(&msc->msc_con->write_queue, cmd); - talloc_free(cmd); -} - -static void osmo_ext_handle(struct bsc_msc_data *msc, struct msgb *msg) -{ - struct ipaccess_head *hh; - struct ipaccess_head_ext *hh_ext; - - hh = (struct ipaccess_head *) msg->data; - hh_ext = (struct ipaccess_head_ext *) hh->data; - if (msg->len < sizeof(*hh) + sizeof(*hh_ext)) { - LOGP(DMSC, LOGL_ERROR, "Packet too short for extended header.\n"); - return; - } - - msg->l2h = hh_ext->data; - if (hh_ext->proto == IPAC_PROTO_EXT_MGCP) - mgcp_forward(msc, msg); - else if (hh_ext->proto == IPAC_PROTO_EXT_LAC) - send_lacs(msc->network, msc->msc_con); - else if (hh_ext->proto == IPAC_PROTO_EXT_CTRL) - handle_ctrl(msc, msg); -} - -static int ipaccess_a_fd_cb(struct osmo_fd *bfd) -{ - struct msgb *msg = NULL; - struct ipaccess_head *hh; - struct bsc_msc_data *data = (struct bsc_msc_data *) bfd->data; - int ret; - - ret = ipa_msg_recv_buffered(bfd->fd, &msg, &data->msc_con->pending_msg); - if (ret <= 0) { - if (ret == -EAGAIN) - return 0; - if (ret == 0) { - LOGP(DMSC, LOGL_ERROR, "The connection to the MSC was lost.\n"); - bsc_msc_lost(data->msc_con); - return -1; - } - - LOGP(DMSC, LOGL_ERROR, "Failed to parse ip access message: %d\n", ret); - return -1; - } - - LOGP(DLMI, LOGL_DEBUG, "From MSC: %s proto: %d\n", osmo_hexdump(msg->data, msg->len), msg->l2h[0]); - - /* handle base message handling */ - hh = (struct ipaccess_head *) msg->data; - - /* initialize the networking. This includes sending a GSM08.08 message */ - msg->cb[0] = (unsigned long) data; - if (hh->proto == IPAC_PROTO_IPACCESS) { - ipa_ccm_rcvmsg_base(msg, bfd); - if (msg->l2h[0] == IPAC_MSGT_ID_ACK) - initialize_if_needed(data->msc_con); - else if (msg->l2h[0] == IPAC_MSGT_ID_GET) { - send_id_get_response(data, bfd->fd, msg); - } else if (msg->l2h[0] == IPAC_MSGT_PONG) { - osmo_timer_del(&data->pong_timer); - } - } else if (hh->proto == IPAC_PROTO_SCCP) { - sccp_system_incoming_ctx(msg, data->msc_con); - } else if (hh->proto == IPAC_PROTO_MGCP_OLD) { - mgcp_forward(data, msg); - } else if (hh->proto == IPAC_PROTO_OSMO) { - osmo_ext_handle(data, msg); - } - - msgb_free(msg); - return 0; -} - -static void send_ping(struct bsc_msc_data *data) -{ - struct msgb *msg; - - msg = msgb_alloc_headroom(4096, 128, "ping"); - if (!msg) { - LOGP(DMSC, LOGL_ERROR, "Failed to create PING.\n"); - return; - } - - msg->l2h = msgb_put(msg, 1); - msg->l2h[0] = IPAC_MSGT_PING; - - msc_queue_write(data->msc_con, msg, IPAC_PROTO_IPACCESS); -} - -static void schedule_ping_pong(struct bsc_msc_data *data) -{ - /* send another ping in 20 seconds */ - osmo_timer_schedule(&data->ping_timer, data->ping_timeout, 0); - - /* also start a pong timer */ - osmo_timer_schedule(&data->pong_timer, data->pong_timeout, 0); -} - -static void msc_ping_timeout_cb(void *_data) -{ - struct bsc_msc_data *data = (struct bsc_msc_data *) _data; - if (data->ping_timeout <= 0) - return; - - send_ping(data); - schedule_ping_pong(data); -} - -static void msc_pong_timeout_cb(void *_data) -{ -// struct bsc_msc_data *data = (struct bsc_msc_data *) _data; - - LOGP(DMSC, LOGL_ERROR, "MSC didn't answer PING. Closing connection.\n"); -// bsc_msc_lost(data->msc_con); -} - -static void msc_connection_connected(struct bsc_msc_connection *con) -{ - struct msc_signal_data sig; - struct bsc_msc_data *data; - int ret, on; - on = 1; -// ret = setsockopt(con->write_queue.bfd.fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)); -// if (ret != 0) -// LOGP(DMSC, LOGL_ERROR, "Failed to set TCP_NODELAY: %s\n", strerror(errno)); - -// data = (struct bsc_msc_data *) con->write_queue.bfd.data; -// msc_ping_timeout_cb(data); - - sig.data = data; - osmo_signal_dispatch(SS_MSC, S_MSC_CONNECTED, &sig); -} - -/* - * The connection to the MSC was lost and we will need to free all - * resources and then attempt to reconnect. - */ -static void msc_connection_was_lost(struct bsc_msc_connection *msc) -{ -// struct msc_signal_data sig; -// struct bsc_msc_data *data; - - LOGP(DMSC, LOGL_ERROR, "Lost MSC connection. Freing stuff.\n"); - -// data = (struct bsc_msc_data *) msc->write_queue.bfd.data; -// osmo_timer_del(&data->ping_timer); -// osmo_timer_del(&data->pong_timer); -// -// sig.data = data; -// osmo_signal_dispatch(SS_MSC, S_MSC_LOST, &sig); - - msc->is_authenticated = 0; -// bsc_msc_schedule_connect(msc); -} - -static void send_lacs(struct gsm_network *net, struct bsc_msc_connection *conn) -{ - struct ipac_ext_lac_cmd *lac; - struct gsm_bts *bts; - struct msgb *msg; - int lacs = 0; - - if (llist_empty(&net->bts_list)) { - LOGP(DMSC, LOGL_ERROR, "No BTSs configured. Not sending LACs.\n"); - return; - } - - msg = msgb_alloc_headroom(4096, 128, "LAC Command"); - if (!msg) { - LOGP(DMSC, LOGL_ERROR, "Failed to create the LAC command.\n"); - return; - } - - lac = (struct ipac_ext_lac_cmd *) msgb_put(msg, sizeof(*lac)); - lac->add_remove = 1; - - llist_for_each_entry(bts, &net->bts_list, list) { - if (lacs++ == 0) - lac->lac = htons(bts->location_area_code); - else - msgb_put_u16(msg, htons(bts->location_area_code)); - } - - lac->nr_extra_lacs = lacs - 1; - ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_LAC); - msc_queue_write(conn, msg, IPAC_PROTO_OSMO); -} - -static void initialize_if_needed(struct bsc_msc_connection *conn) -{ - struct msgb *msg; - - if (!conn->is_authenticated) { - /* send a gsm 08.08 reset message from here */ - msg = gsm0808_create_reset(); - if (!msg) { - LOGP(DMSC, LOGL_ERROR, "Failed to create the reset message.\n"); - return; - } - - sccp_write(msg, &sccp_ssn_bssap, &sccp_ssn_bssap, 0, conn); - msgb_free(msg); - conn->is_authenticated = 1; - } -} - -static int answer_challenge(struct bsc_msc_data *data, struct msgb *inp, struct osmo_auth_vector *vec) -{ - int ret; - struct tlv_parsed tvp; - const uint8_t *mrand; - uint8_t mrand_len; - struct osmo_sub_auth_data auth = { - .type = OSMO_AUTH_TYPE_GSM, - .algo = OSMO_AUTH_ALG_MILENAGE, - }; - - ret = ipa_ccm_idtag_parse_off(&tvp, - inp->l2h + 1, - msgb_l2len(inp) - 1, 1); - if (ret < 0) { - LOGP(DMSC, LOGL_ERROR, "ignoring IPA response " - "message with malformed TLVs: %s\n", osmo_hexdump(inp->l2h + 1, - msgb_l2len(inp) - 1)); - return 0; - } - - mrand = TLVP_VAL(&tvp, 0x23); - mrand_len = TLVP_LEN(&tvp, 0x23); - if (mrand_len != 16) { - LOGP(DMSC, LOGL_ERROR, - "RAND is not 16 bytes. Was %d\n", - mrand_len); - return 0; - } - - /* copy the key */ - memcpy(auth.u.umts.opc, data->bsc_key, 16); - memcpy(auth.u.umts.k, data->bsc_key, 16); - memset(auth.u.umts.amf, 0, 2); - auth.u.umts.sqn = 0; - - /* generate the result */ - memset(vec, 0, sizeof(*vec)); - osmo_auth_gen_vec(vec, &auth, mrand); - return 1; -} - - -static void send_id_get_response(struct bsc_msc_data *data, int fd, struct msgb *inp) -{ - struct msc_signal_data sig; - struct msgb *msg; - struct osmo_auth_vector vec; - int valid = 0; - - if (data->bsc_key_present) - valid = answer_challenge(data, inp, &vec); - - msg = bsc_msc_id_get_resp(valid, data->bsc_token, - vec.res, valid ? vec.res_len : 0); - if (!msg) - return; - msc_queue_write(data->msc_con, msg, IPAC_PROTO_IPACCESS); - - sig.data = data; - osmo_signal_dispatch(SS_MSC, S_MSC_AUTHENTICATED, &sig); -} - -#endif - int osmo_bsc_msc_init(struct bsc_msc_data *data) { - if (mgcp_create_port(data) != 0) - return -1; - data->msc_con = bsc_msc_create(data, &data->dests); if (!data->msc_con) { LOGP(DMSC, LOGL_ERROR, "Creating the MSC network connection failed.\n"); return -1; } -// osmo_timer_setup(&data->ping_timer, msc_ping_timeout_cb, data); -// osmo_timer_setup(&data->pong_timer, msc_pong_timeout_cb, data); - - data->msc_con->write_queue.bfd.data = data; -// data->msc_con->connection_loss = msc_connection_was_lost; -// data->msc_con->connected = msc_connection_connected; -// data->msc_con->write_queue.read_cb = ipaccess_a_fd_cb; -// data->msc_con->write_queue.write_cb = msc_alink_do_write; -// bsc_msc_connect(data->msc_con); - data->msc_con->is_connected = 1; data->msc_con->is_authenticated = 1; - return 0; } - struct bsc_msc_data *osmo_msc_data_find(struct gsm_network *net, int nr) { struct bsc_msc_data *msc_data; @@ -579,8 +83,6 @@ struct bsc_msc_data *osmo_msc_data_alloc(struct gsm_network *net, int nr) msc_data->network = net; INIT_LLIST_HEAD(&msc_data->dests); - msc_data->ping_timeout = 20; - msc_data->pong_timeout = 5; msc_data->core_plmn = (struct osmo_plmn_id){ .mcc = GSM_MCC_MNC_INVALID, .mnc = GSM_MCC_MNC_INVALID, diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index 3455d01af..7968e2166 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -122,17 +122,6 @@ static void write_msc(struct vty *vty, struct bsc_msc_data *msc) msc->core_ci, VTY_NEWLINE); vty_out(vty, " ip.access rtp-base %d%s", msc->rtp_base, VTY_NEWLINE); - if (msc->ping_timeout == -1) - vty_out(vty, " no timeout-ping%s", VTY_NEWLINE); - else { - vty_out(vty, " timeout-ping %d%s", msc->ping_timeout, VTY_NEWLINE); - vty_out(vty, " timeout-pong %d%s", msc->pong_timeout, VTY_NEWLINE); - if (msc->advanced_ping) - vty_out(vty, " timeout-ping advanced%s", VTY_NEWLINE); - else - vty_out(vty, " no timeout-ping advanced%s", VTY_NEWLINE); - } - if (msc->ussd_welcome_txt) vty_out(vty, " bsc-welcome-text %s%s", msc->ussd_welcome_txt, VTY_NEWLINE); else @@ -396,64 +385,6 @@ DEFUN(cfg_net_msc_no_dest, return CMD_SUCCESS; } -DEFUN(cfg_net_msc_no_ping_time, - cfg_net_msc_no_ping_time_cmd, - "no timeout-ping", - NO_STR "Disable the ping/pong handling on A-link\n") -{ - struct bsc_msc_data *data = bsc_msc_data(vty); - data->ping_timeout = -1; - return CMD_SUCCESS; -} - -DEFUN(cfg_net_msc_ping_time, - cfg_net_msc_ping_time_cmd, - "timeout-ping <1-2147483647>", - "Set the PING interval, negative for not sending PING\n" - "Timeout in seconds\n") -{ - struct bsc_msc_data *data = bsc_msc_data(vty); - data->ping_timeout = atoi(argv[0]); - return CMD_SUCCESS; -} - -DEFUN(cfg_net_msc_pong_time, - cfg_net_msc_pong_time_cmd, - "timeout-pong <1-2147483647>", - "Set the time to wait for a PONG\n" "Timeout in seconds\n") -{ - struct bsc_msc_data *data = bsc_msc_data(vty); - data->pong_timeout = atoi(argv[0]); - return CMD_SUCCESS; -} - -DEFUN(cfg_net_msc_advanced_ping, - cfg_net_msc_advanced_ping_cmd, - "timeout-ping advanced", - "Ping timeout handling\nEnable advanced mode during SCCP\n") -{ - struct bsc_msc_data *data = bsc_msc_data(vty); - - if (data->ping_timeout == -1) { - vty_out(vty, "%%ping handling is disabled. Enable it first.%s", - VTY_NEWLINE); - return CMD_WARNING; - } - - data->advanced_ping = 1; - return CMD_SUCCESS; -} - -DEFUN(cfg_no_net_msc_advanced_ping, - cfg_no_net_msc_advanced_ping_cmd, - "no timeout-ping advanced", - NO_STR "Ping timeout handling\nEnable advanced mode during SCCP\n") -{ - struct bsc_msc_data *data = bsc_msc_data(vty); - data->advanced_ping = 0; - return CMD_SUCCESS; -} - DEFUN(cfg_net_msc_welcome_ussd, cfg_net_msc_welcome_ussd_cmd, "bsc-welcome-text .TEXT", @@ -980,11 +911,6 @@ int bsc_vty_init_extra(void) install_element(MSC_NODE, &cfg_net_bsc_codec_list_cmd); install_element(MSC_NODE, &cfg_net_msc_dest_cmd); install_element(MSC_NODE, &cfg_net_msc_no_dest_cmd); - install_element(MSC_NODE, &cfg_net_msc_no_ping_time_cmd); - install_element(MSC_NODE, &cfg_net_msc_ping_time_cmd); - install_element(MSC_NODE, &cfg_net_msc_pong_time_cmd); - install_element(MSC_NODE, &cfg_net_msc_advanced_ping_cmd); - install_element(MSC_NODE, &cfg_no_net_msc_advanced_ping_cmd); install_element(MSC_NODE, &cfg_net_msc_welcome_ussd_cmd); install_element(MSC_NODE, &cfg_net_msc_no_welcome_ussd_cmd); install_element(MSC_NODE, &cfg_net_msc_lost_ussd_cmd); diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py index 387ea70c5..3b73ce7db 100755 --- a/tests/vty_test_runner.py +++ b/tests/vty_test_runner.py @@ -234,47 +234,6 @@ class TestVTYBSC(TestVTYGenericBSC): res = self.vty.command("show network") self.assert_(res.startswith('BSC is on Country Code') >= 0) - def testPingPongConfiguration(self): - self.vty.enable() - self.vty.verify("configure terminal", ['']) - self.vty.verify("msc 0", ['']) - - self.vty.verify("timeout-ping 12", ['']) - self.vty.verify("timeout-pong 14", ['']) - res = self.vty.command("show running-config") - self.assert_(res.find(" timeout-ping 12") > 0) - self.assert_(res.find(" timeout-pong 14") > 0) - self.assert_(res.find(" no timeout-ping advanced") > 0) - - self.vty.verify("timeout-ping advanced", ['']) - res = self.vty.command("show running-config") - self.assert_(res.find(" timeout-ping 12") > 0) - self.assert_(res.find(" timeout-pong 14") > 0) - self.assert_(res.find(" timeout-ping advanced") > 0) - - self.vty.verify("no timeout-ping advanced", ['']) - res = self.vty.command("show running-config") - self.assert_(res.find(" timeout-ping 12") > 0) - self.assert_(res.find(" timeout-pong 14") > 0) - self.assert_(res.find(" no timeout-ping advanced") > 0) - - self.vty.verify("no timeout-ping", ['']) - res = self.vty.command("show running-config") - self.assertEquals(res.find(" timeout-ping 12"), -1) - self.assertEquals(res.find(" timeout-pong 14"), -1) - self.assertEquals(res.find(" no timeout-ping advanced"), -1) - self.assert_(res.find(" no timeout-ping") > 0) - - self.vty.verify("timeout-ping advanced", ['%ping handling is disabled. Enable it first.']) - - # And back to enabling it - self.vty.verify("timeout-ping 12", ['']) - self.vty.verify("timeout-pong 14", ['']) - res = self.vty.command("show running-config") - self.assert_(res.find(" timeout-ping 12") > 0) - self.assert_(res.find(" timeout-pong 14") > 0) - self.assert_(res.find(" timeout-ping advanced") > 0) - def testMscDataCoreLACCI(self): self.vty.enable() res = self.vty.command("show running-config") |