diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-07-31 17:43:08 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-07-31 17:43:08 +0200 |
| commit | caca1899ce5ea5fd8e32c3ea93961a6156531a6c (patch) | |
| tree | 65fa12568572da2601b7eaaebd4deabfb96d7616 /src/osmo-bts-sysmo | |
| parent | fcdfb690ca68fcac64ac19ada3680832d45c8469 (diff) | |
sysmobts: Make sure that the omlrouter is in a FHS path
I wondered if I should use the 'abstract namespace' feature
of Linux but just put the router into /var/run/ to make it
work out of the box. Change the signature to provide a sane
error message.
Diffstat (limited to 'src/osmo-bts-sysmo')
| -rw-r--r-- | src/osmo-bts-sysmo/main.c | 5 | ||||
| -rw-r--r-- | src/osmo-bts-sysmo/oml_router.c | 4 | ||||
| -rw-r--r-- | src/osmo-bts-sysmo/oml_router.h | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index 60a4a7ff..5a864074 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -369,9 +369,10 @@ int main(int argc, char **argv) signal(SIGUSR2, &signal_handler); osmo_init_ignore_signals(); - rc = oml_router_init(bts, &accept_fd, &read_fd); + rc = oml_router_init(bts, OML_ROUTER_PATH, &accept_fd, &read_fd); if (rc < 0) { - perror("Error creating the OML router\n"); + fprintf(stderr, "Error creating the OML router: %s rc=%d\n", + OML_ROUTER_PATH, rc); exit(1); } diff --git a/src/osmo-bts-sysmo/oml_router.c b/src/osmo-bts-sysmo/oml_router.c index 4af20d50..f3d08373 100644 --- a/src/osmo-bts-sysmo/oml_router.c +++ b/src/osmo-bts-sysmo/oml_router.c @@ -106,7 +106,7 @@ static int oml_router_accept_cb(struct osmo_fd *accept_fd, unsigned int what) return 0; } -int oml_router_init(struct gsm_bts *bts, +int oml_router_init(struct gsm_bts *bts, const char *path, struct osmo_fd *accept_fd, struct osmo_fd *read_fd) { int rc; @@ -123,7 +123,7 @@ int oml_router_init(struct gsm_bts *bts, read_fd->fd = -1; rc = osmo_sock_unix_init_ofd(accept_fd, SOCK_SEQPACKET, 0, - OML_ROUTER_PATH, + path, OSMO_SOCK_F_BIND | OSMO_SOCK_F_NONBLOCK); return rc; } diff --git a/src/osmo-bts-sysmo/oml_router.h b/src/osmo-bts-sysmo/oml_router.h index f8fe4c95..55f0681d 100644 --- a/src/osmo-bts-sysmo/oml_router.h +++ b/src/osmo-bts-sysmo/oml_router.h @@ -7,7 +7,7 @@ struct osmo_fd; * The default path sysmobts will listen for incoming * registrations for OML routing and sending. */ -#define OML_ROUTER_PATH "/var/run/sysmobts/oml_router" +#define OML_ROUTER_PATH "/var/run/sysmobts_oml_router" -int oml_router_init(struct gsm_bts *bts, struct osmo_fd *accept, struct osmo_fd *read); +int oml_router_init(struct gsm_bts *bts, const char *path, struct osmo_fd *accept, struct osmo_fd *read); |