- OpenBSC - lists.osmocom.org

[PATCH] ipa driver: make bind address vty configurable
by Neels Hofmeyr 24 Feb '16

24 Feb '16

Add VTY function to set the ipa bind address: e1_input ipa bind A.B.C.D Add a priv pointer to struct e1inp_driver in order to communicate the bind address parameter to ipaccess_line_update(). Add two "internal.h" functions to get/set it in the ipa driver struct. Add static ip_bind_addr() to use the IP address set from the VTY or, if NULL, use "0.0.0.0". Apply in ipaccess_line_update(). --- include/internal.h | 3 +++ include/osmocom/abis/e1_input.h | 1 + src/e1_input_vty.c | 20 ++++++++++++++++++++ src/input/ipaccess.c | 28 ++++++++++++++++++++++++++-- 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/include/internal.h b/include/internal.h index 7f6e31a..740a86d 100644 --- a/include/internal.h +++ b/include/internal.h @@ -13,6 +13,9 @@ extern void *libosmo_abis_ctx; /* use libosmo_abis_init, this is only for internal use. */ void e1inp_init(void); +void e1inp_ipaccess_set_bind(const char *ip_bind_addr); +const char *e1inp_ipaccess_get_bind(void); + /* ipaccess.c requires these functions defined here */ struct msgb; struct msgb *ipa_msg_alloc(int headroom); diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index e5d2991..4d00e03 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -139,6 +139,7 @@ struct e1inp_driver { void (*vty_show)(struct vty *vty, struct e1inp_line *line); int default_delay; int has_keepalive; + void *priv; }; struct e1inp_line_ops { diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c index 0b4adb2..71747f0 100644 --- a/src/e1_input_vty.c +++ b/src/e1_input_vty.c @@ -168,6 +168,18 @@ DEFUN(cfg_e1inp, cfg_e1inp_cmd, return CMD_SUCCESS; } +DEFUN(cfg_ipa_bind, + cfg_ipa_bind_cmd, + "ipa bind A.B.C.D", + "ipa driver config\n" + "Set ipa local bind address\n" + "Listen on this IP address (default 0.0.0.0)\n") +{ + e1inp_ipaccess_set_bind(argv[0]); + return CMD_SUCCESS; +} + + static int e1inp_config_write(struct vty *vty) { struct e1inp_line *line; @@ -202,6 +214,12 @@ static int e1inp_config_write(struct vty *vty) VTY_NEWLINE); } + + const char *ipa_bind = e1inp_ipaccess_get_bind(); + if (ipa_bind) + vty_out(vty, " ipa bind %s%s", + ipa_bind, VTY_NEWLINE); + return CMD_SUCCESS; } @@ -351,6 +369,8 @@ int e1inp_vty_init(void) install_element(L_E1INP_NODE, &cfg_e1_line_keepalive_params_cmd); install_element(L_E1INP_NODE, &cfg_e1_line_no_keepalive_cmd); + install_element(L_E1INP_NODE, &cfg_ipa_bind_cmd); + install_element_ve(&show_e1drv_cmd); install_element_ve(&show_e1line_cmd); install_element_ve(&show_e1ts_cmd); diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 8ffdb19..d645e24 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -804,6 +804,13 @@ struct ipaccess_line { int line_already_initialized; }; +static const char *ip_bind_addr() +{ + return ipaccess_driver.priv? + ((const char*)ipaccess_driver.priv) + : "0.0.0.0"; +} + static int ipaccess_line_update(struct e1inp_line *line) { int ret = -ENOENT; @@ -831,7 +838,7 @@ static int ipaccess_line_update(struct e1inp_line *line) LOGP(DLINP, LOGL_NOTICE, "enabling ipaccess BSC mode\n"); oml_link = ipa_server_link_create(tall_ipa_ctx, line, - "0.0.0.0", IPA_TCP_PORT_OML, + ip_bind_addr(), IPA_TCP_PORT_OML, ipaccess_bsc_oml_cb, NULL); if (oml_link == NULL) { LOGP(DLINP, LOGL_ERROR, "cannot create OML " @@ -845,7 +852,7 @@ static int ipaccess_line_update(struct e1inp_line *line) return -EIO; } rsl_link = ipa_server_link_create(tall_ipa_ctx, line, - "0.0.0.0", IPA_TCP_PORT_RSL, + ip_bind_addr(), IPA_TCP_PORT_RSL, ipaccess_bsc_rsl_cb, NULL); if (rsl_link == NULL) { LOGP(DLINP, LOGL_ERROR, "cannot create RSL " @@ -944,3 +951,20 @@ void e1inp_ipaccess_init(void) tall_ipa_ctx = talloc_named_const(libosmo_abis_ctx, 1, "ipa"); e1inp_driver_register(&ipaccess_driver); } + +void e1inp_ipaccess_set_bind(const char *ip_bind_addr) +{ + if (ipaccess_driver.priv) { + talloc_free(ipaccess_driver.priv); + ipaccess_driver.priv = NULL; + } + + if (ip_bind_addr) + ipaccess_driver.priv = (void*)talloc_strdup(tall_ipa_ctx, + ip_bind_addr); +} + +const char *e1inp_ipaccess_get_bind(void) +{ + return (const char*)ipaccess_driver.priv; +} -- 2.1.4

1 0

[PATCH] v2 of: configure Abis/IP bind address
by Neels Hofmeyr 24 Feb '16

24 Feb '16

I decided to drop the 'any' keyword from the Abis bind address config, to ensure that the written config is always identical to the parsed config. Neels Hofmeyr (1): ipa driver: make bind address vty configurable include/internal.h | 3 +++ include/osmocom/abis/e1_input.h | 1 + src/e1_input_vty.c | 20 ++++++++++++++++++++ src/input/ipaccess.c | 28 ++++++++++++++++++++++++++-- 4 files changed, 50 insertions(+), 2 deletions(-) -- 2.1.4

1 0

[PATCH] v2 of: configure Abis/IP bind address
by Neels Hofmeyr 24 Feb '16

24 Feb '16

I decided to drop the 'any' keyword from the Abis bind address config, to ensure that the written config is always identical to the parsed config. Neels Hofmeyr (1): ipa driver: make bind address vty configurable include/internal.h | 3 +++ include/osmocom/abis/e1_input.h | 1 + src/e1_input_vty.c | 20 ++++++++++++++++++++ src/input/ipaccess.c | 28 ++++++++++++++++++++++++++-- 4 files changed, 50 insertions(+), 2 deletions(-) -- 2.1.4

1 0

[PATCH] configure Abis/IP bind address
by Neels Hofmeyr 23 Feb '16

23 Feb '16

This patch allows Abis/IP bind address config for osmo-nitb as well as the osmo-bscs, without touching openbsc.git. This is the libosmo-abis part of making osmo-nitb's IP addresses configurable instead of always listening on 'any'. This will allow running more than one on the same box. Ctrl interface and vty are to follow, though not in this repo. I did sink a bit of time until the penny dropped that all I need to do is add a VTY command in libosmo-abis, but I did find out eventually. Neels Hofmeyr (1): ipa driver: make bind address vty configurable include/internal.h | 3 +++ include/osmocom/abis/e1_input.h | 1 + src/e1_input_vty.c | 27 +++++++++++++++++++++++++++ src/input/ipaccess.c | 28 ++++++++++++++++++++++++++-- 4 files changed, 57 insertions(+), 2 deletions(-) -- 2.1.4

1 1

[PATCH] ipa driver: make bind address vty configurable
by Neels Hofmeyr 22 Feb '16

22 Feb '16

Add VTY function to set the ipa bind address: e1_input ipa bind A.B.C.D Add a priv pointer to struct e1inp_driver in order to communicate the bind address parameter to ipaccess_line_update(). Add two "internal.h" functions to get/set it in the ipa driver struct. Add static ip_bind_addr() to use the IP address set from the VTY or, if NULL, use "0.0.0.0". Apply in ipaccess_line_update(). --- include/internal.h | 3 +++ include/osmocom/abis/e1_input.h | 1 + src/e1_input_vty.c | 20 ++++++++++++++++++++ src/input/ipaccess.c | 28 ++++++++++++++++++++++++++-- 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/include/internal.h b/include/internal.h index 7f6e31a..740a86d 100644 --- a/include/internal.h +++ b/include/internal.h @@ -13,6 +13,9 @@ extern void *libosmo_abis_ctx; /* use libosmo_abis_init, this is only for internal use. */ void e1inp_init(void); +void e1inp_ipaccess_set_bind(const char *ip_bind_addr); +const char *e1inp_ipaccess_get_bind(void); + /* ipaccess.c requires these functions defined here */ struct msgb; struct msgb *ipa_msg_alloc(int headroom); diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index e5d2991..4d00e03 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -139,6 +139,7 @@ struct e1inp_driver { void (*vty_show)(struct vty *vty, struct e1inp_line *line); int default_delay; int has_keepalive; + void *priv; }; struct e1inp_line_ops { diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c index 0b4adb2..71747f0 100644 --- a/src/e1_input_vty.c +++ b/src/e1_input_vty.c @@ -168,6 +168,18 @@ DEFUN(cfg_e1inp, cfg_e1inp_cmd, return CMD_SUCCESS; } +DEFUN(cfg_ipa_bind, + cfg_ipa_bind_cmd, + "ipa bind A.B.C.D", + "ipa driver config\n" + "Set ipa local bind address\n" + "Listen on this IP address (default 0.0.0.0)\n") +{ + e1inp_ipaccess_set_bind(argv[0]); + return CMD_SUCCESS; +} + + static int e1inp_config_write(struct vty *vty) { struct e1inp_line *line; @@ -202,6 +214,12 @@ static int e1inp_config_write(struct vty *vty) VTY_NEWLINE); } + + const char *ipa_bind = e1inp_ipaccess_get_bind(); + if (ipa_bind) + vty_out(vty, " ipa bind %s%s", + ipa_bind, VTY_NEWLINE); + return CMD_SUCCESS; } @@ -351,6 +369,8 @@ int e1inp_vty_init(void) install_element(L_E1INP_NODE, &cfg_e1_line_keepalive_params_cmd); install_element(L_E1INP_NODE, &cfg_e1_line_no_keepalive_cmd); + install_element(L_E1INP_NODE, &cfg_ipa_bind_cmd); + install_element_ve(&show_e1drv_cmd); install_element_ve(&show_e1line_cmd); install_element_ve(&show_e1ts_cmd); diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 8ffdb19..d645e24 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -804,6 +804,13 @@ struct ipaccess_line { int line_already_initialized; }; +static const char *ip_bind_addr() +{ + return ipaccess_driver.priv? + ((const char*)ipaccess_driver.priv) + : "0.0.0.0"; +} + static int ipaccess_line_update(struct e1inp_line *line) { int ret = -ENOENT; @@ -831,7 +838,7 @@ static int ipaccess_line_update(struct e1inp_line *line) LOGP(DLINP, LOGL_NOTICE, "enabling ipaccess BSC mode\n"); oml_link = ipa_server_link_create(tall_ipa_ctx, line, - "0.0.0.0", IPA_TCP_PORT_OML, + ip_bind_addr(), IPA_TCP_PORT_OML, ipaccess_bsc_oml_cb, NULL); if (oml_link == NULL) { LOGP(DLINP, LOGL_ERROR, "cannot create OML " @@ -845,7 +852,7 @@ static int ipaccess_line_update(struct e1inp_line *line) return -EIO; } rsl_link = ipa_server_link_create(tall_ipa_ctx, line, - "0.0.0.0", IPA_TCP_PORT_RSL, + ip_bind_addr(), IPA_TCP_PORT_RSL, ipaccess_bsc_rsl_cb, NULL); if (rsl_link == NULL) { LOGP(DLINP, LOGL_ERROR, "cannot create RSL " @@ -944,3 +951,20 @@ void e1inp_ipaccess_init(void) tall_ipa_ctx = talloc_named_const(libosmo_abis_ctx, 1, "ipa"); e1inp_driver_register(&ipaccess_driver); } + +void e1inp_ipaccess_set_bind(const char *ip_bind_addr) +{ + if (ipaccess_driver.priv) { + talloc_free(ipaccess_driver.priv); + ipaccess_driver.priv = NULL; + } + + if (ip_bind_addr) + ipaccess_driver.priv = (void*)talloc_strdup(tall_ipa_ctx, + ip_bind_addr); +} + +const char *e1inp_ipaccess_get_bind(void) +{ + return (const char*)ipaccess_driver.priv; +} -- 2.1.4

1 0

rebase sysmocom-iu? branch 'jerlbeck/fixes/sgsn' merged to master
by Neels Hofmeyr 22 Feb '16

22 Feb '16

Hi Daniel, the 'jerlbeck/fixes/sgsn' branch has been merged to master. sysmocom-iu has some merge conflicts in the SGSN, so I assume it's better if you do the rebase of sysmocom-iu onto master. Agree? It would also be nice if we did the merge together ... maybe ping me when you do the rebase and I'll see if I join you. I would like to stay as close to master as possible to avoid conflict build up. If you could do the rebase sooner rather than later, that would be great. Thanks! (I could have told you in person but it's good to let the list know, too) ~Neels -- - Neels Hofmeyr <nhofmeyr(a)sysmocom.de> http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschäftsführer / Managing Directors: Holger Freyther, Harald Welte

1 0

osmo-nitb configurable
by Neels Hofmeyr 22 Feb '16

22 Feb '16

Hi Harald, Holger has just refreshed my memory on a conversation we've had on running multiple NITB instances on the same box: Linux Network Namespaces vs. making NITB configurable. Kindly remind me of the immediate plans, should we make osmo-nitb configurable to bind on only specific IP addresses, like, now? IIUC that would be a VTY item for osmo-nitb and a parameter into libosmo-abis. Concerning the VTY, the port could be configurable, or the IP address, thinking of 127.0.0.42. I guess relying on `ip netns` would be quicker for now, and I'd have slightly more time for IuCS. Is there anyone else out there that would love to configure osmo-nitb to bind on specific IP addresses only? Thanks, ~Neels -- - Neels Hofmeyr <nhofmeyr(a)sysmocom.de> http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschäftsführer / Managing Directors: Holger Freyther, Harald Welte

2 2

sysmocom/iu: your commits from today
by Neels Hofmeyr 22 Feb '16

22 Feb '16

Moin Daniel :) (1) About ebd4d820b3b0d7ba5db3b25a14f407d0c7276044 "libiu: Use custom setupormodifieditemies function" It seems you forgot to commit the actual function definition of ranap_decode_rab_setupormodifieditemies_fromlist() I got the caller of it only and thus can't compile as-is. (2) About 38e2f1bca4e43414ed39a938d7c5d8bafe5e8533 " Revert "iu.c: avoid warning by declaring ranap_free_rab_setupormodifieditemies()" There should be no need to silence this warning, the ranap_free_* functions are declared in libranap headers. In any case this will only obscure any real issue. Maybe osmo-iuh was not rebuilt completely (including generation of the c files from the python script). This reverts commit 05ae5b1245f95bf765b42e49af7b2596e013f0a0. " I declared ranap_free_rab_setupormodifieditemies() like that because it is indeed not declared in a header that is installed. Also a grep tells me that no ranap_free_* is found in any osmo-iuh header file at all. I also did a 'make regen' in osmo-iuh/src/ to no avail. By 'libranap headers' I assume you mean libosmo-ranap, or is there a libranap I'm not aware of yet? If the ranap_free_* aren't in headers yet, I agree that they should be. I wanted to silence the warning without being sucked down the rabbit hole of autogenerated asn1 stuff. Any suggestions: more than welcome. (3) In general, I would welcome to see more of your WIP work in publicly visible private branches, maturing as you go and merged to sysmocom/iu once ready. For one, having a backup of your work-in-progress in the git repos makes it harder to lose it due to hardware failure. More important for me though is that I can see what you're up to, e.g. I could possibly find the ranap_..._fromlist() function defintion now. It's of course opening up your "most private" code developments to the outside world, possibly some stupid commits will be seen by one or two hacker peers, but I think it's a healthy premise that we all commit mostly bollocks and all needs refinement anyway... once again: push it! :) Ah, push it Push it good Ah, push it Pu-Push it real good -- Salt N Pepa (1987) As always I'm open to opinions and suggestions... ~Neels -- - Neels Hofmeyr <nhofmeyr(a)sysmocom.de> http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschäftsführer / Managing Directors: Holger Freyther, Harald Welte

3 13

[PATCH 1/3] Ignore files generated by cscope tool
by msuraev＠sysmocom.de 22 Feb '16

22 Feb '16

From: Max <msuraev(a)sysmocom.de> Signed-off-by: Max <msuraev(a)sysmocom.de> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6cc9aa5..a22fd4f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ Makefile.in Makefile .deps +src/cscope* aclocal.m4 autom4te.cache -- 2.7.1

1 2

[PATCH] Extend L1SAP PH-DATA with presence information
by msuraev＠sysmocom.de 22 Feb '16

22 Feb '16

From: Max <msuraev(a)sysmocom.de> Previously the presence of header and data blocks were communicated in-band which decreases code readability and makes it unnecessary hard to add support for new hardware. Note: OsmoBTS have to be modified to take advantage of extended ph_data_param structure. --- TODO-RELEASE | 1 + include/osmocom/gsm/l1sap.h | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/TODO-RELEASE b/TODO-RELEASE index edf1099..0939336 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1,2 +1,3 @@ #library what description / commit summary line libosmocore change major external talloc dependency / internal talloc removal +libosmocore change major size of ph_data_param struct changed / Extend L1SAP PH-DATA with presence information \ No newline at end of file diff --git a/include/osmocom/gsm/l1sap.h b/include/osmocom/gsm/l1sap.h index 9f3fe98..1af8ba8 100644 --- a/include/osmocom/gsm/l1sap.h +++ b/include/osmocom/gsm/l1sap.h @@ -25,6 +25,16 @@ enum osmo_mph_info_type { PRIM_INFO_DEACT_CIPH, /*!< \brief Deactivation of ciphering */ }; +/*! \brief PH-DATA presence information */ +enum osmo_ph_pres_info_type { + PRES_INFO_INVALID = 0, /*!< \brief Data is invalid */ + PRES_INFO_HEADER = 1, /*!< \brief Only header is present and valid */ + PRES_INFO_FIRST = 3, /*!< \brief First half of data + header are valid (2nd half may be present but invalid) */ + PRES_INFO_SECOND = 5, /*!< \brief Second half of data + header are valid (1st halfmay be present but invalid) */ + PRES_INFO_BOTH = 7, /*!< \brief Both parts + header are present and valid */ + PRES_INFO_UNKNOWN +}; + /*! \brief for PH-RANDOM_ACCESS.req */ struct ph_rach_req_param { uint8_t ra; /*!< \brief Random Access */ @@ -48,6 +58,7 @@ struct ph_data_param { uint8_t chan_nr; /*!< \brief Channel Number (Like RSL) */ uint32_t fn; /*!< \brief GSM Frame Number */ int8_t rssi; /*!< \brief RSSI of receivedindication */ + enum osmo_ph_pres_info_type pdch_presence_info; /*!< \brief Info regarding presence/validity of header and data parts */ }; /*! \brief for TCH.{req,ind} | TCH-RTS.ind */ -- 2.7.1

1 0