From 1aef9a6e1f12d8c710d21a9e8abf688dd81b350a Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Sat, 12 Aug 2017 18:02:44 +0200 Subject: iu_client: derive local SCCP addr from sccp instance ranap_iu_init() is passed an sccp instance that has a local primary point code. Use this primary PC by default as the local address for IuCS and IuPS clients. Remove the current vty command 'iu local-address point-code PC': - It is possible that we would like to configure a differing local point code at some point; this should then happen via sccp address book entries, not parsing PC directly. - Obtaining the local PC from the SCCP instance makes this command obsolete for all setups we're currently aiming at: one local PC per SCCP instance. - There are vty doc failures in this vty command, which cause osmo-msc and osmo-bsc vty test failures; rather than fixing this, let's drop it entirely until we see a need for it (and then do it properly with the address book). Cosmetic: prefix the local static variable with g_* like g_sccp and g_scu and define it in the same place. No default values are needed anymore, it gets overwritten in ranap_iu_init(). Change-Id: I3bb7fc1cd5261d214c6ba0cccfe95f637e6db087 --- src/iu_client_vty.c | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'src/iu_client_vty.c') diff --git a/src/iu_client_vty.c b/src/iu_client_vty.c index b809b2a..a99facd 100644 --- a/src/iu_client_vty.c +++ b/src/iu_client_vty.c @@ -75,21 +75,6 @@ DEFUN(cfg_iu_rab_assign_addr_enc, cfg_iu_rab_assign_addr_enc_cmd, return CMD_SUCCESS; } -extern struct osmo_sccp_addr local_sccp_addr; - -DEFUN(cfg_iu_local_addr_pc, cfg_iu_local_addr_pc_cmd, - "iu local-address point-code PC", - IU_STR "Local SCCP Address\n") -{ - local_sccp_addr.presence = OSMO_SCCP_ADDR_T_PC | OSMO_SCCP_ADDR_T_SSN; - local_sccp_addr.ri = OSMO_SCCP_RI_SSN_PC; - local_sccp_addr.pc = osmo_ss7_pointcode_parse(NULL, argv[0]); - - return CMD_SUCCESS; -} - -/* TODO: GT address configuration, in line with 4.5.1.1.1 of TS 25.410 */ - int ranap_iu_vty_config_write(struct vty *vty, const char *indent) { if (!g_rab_assign_addr_enc) { @@ -113,9 +98,6 @@ int ranap_iu_vty_config_write(struct vty *vty, const char *indent) return CMD_WARNING; } - vty_out(vty, "%siu local-address point-code %s%s", indent, - osmo_ss7_pointcode_print(NULL, local_sccp_addr.pc), VTY_NEWLINE); - if (asn_debug) vty_out(vty, "%sasn1 debug 1%s", indent, VTY_NEWLINE); @@ -130,7 +112,6 @@ void ranap_iu_vty_init(int iu_parent_node, enum ranap_nsap_addr_enc *rab_assign_ g_rab_assign_addr_enc = rab_assign_addr_enc; install_element(iu_parent_node, &cfg_iu_rab_assign_addr_enc_cmd); - install_element(iu_parent_node, &cfg_iu_local_addr_pc_cmd); /* Technically, these are global ASN.1 settings and not necessarily limited to the Iu interface. * Practically, only Iu users will use ASN.1 in Osmocom programs -- at least so far. So it is -- cgit v1.2.3