diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-10-26 18:37:09 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-11-06 21:41:51 +0100 |
| commit | 694c82d8e39b2399ad5ea158839c181aca03f350 (patch) | |
| tree | 6b69240ec52aa4daf754b3a9e7796d12a741cb1c /openbsc/src | |
| parent | 2a260ee9bc70acee156ab240f5a870b65dea5cd1 (diff) | |
mncc: Address the fixme and put the mncc_sock_state in gsm_network
Remove the unused mncc_sock_write_pending, switch over from the
static s_state to net->mncc_state.
Diffstat (limited to 'openbsc/src')
| -rw-r--r-- | openbsc/src/libmsc/mncc_sock.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/openbsc/src/libmsc/mncc_sock.c b/openbsc/src/libmsc/mncc_sock.c index d8caf0754..3ab40a8d9 100644 --- a/openbsc/src/libmsc/mncc_sock.c +++ b/openbsc/src/libmsc/mncc_sock.c @@ -43,9 +43,6 @@ struct mncc_sock_state { struct osmo_fd conn_bfd; /* fd for connection to lcr */ }; -/* FIXME: avoid this */ -static struct mncc_sock_state *g_state; - /* input from CC code into mncc_sock */ int mncc_sock_from_cc(struct gsm_network *net, struct msgb *msg) { @@ -53,7 +50,7 @@ int mncc_sock_from_cc(struct gsm_network *net, struct msgb *msg) int msg_type = mncc_in->msg_type; /* Check if we currently have a MNCC handler connected */ - if (g_state->conn_bfd.fd < 0) { + if (net->mncc_state->conn_bfd.fd < 0) { LOGP(DMNCC, LOGL_ERROR, "mncc_sock receives %s for external CC app " "but socket is gone\n", get_mncc_name(msg_type)); if (msg_type != GSM_TCHF_FRAME && @@ -75,15 +72,10 @@ int mncc_sock_from_cc(struct gsm_network *net, struct msgb *msg) /* Actually enqueue the message and mark socket write need */ msgb_enqueue(&net->upqueue, msg); - g_state->conn_bfd.when |= BSC_FD_WRITE; + net->mncc_state->conn_bfd.when |= BSC_FD_WRITE; return 0; } -void mncc_sock_write_pending(void) -{ - g_state->conn_bfd.when |= BSC_FD_WRITE; -} - /* FIXME: move this to libosmocore */ int osmo_unixsock_listen(struct osmo_fd *bfd, int type, const char *path); @@ -292,7 +284,7 @@ int mncc_sock_init(struct gsm_network *net) return rc; } - g_state = state; + net->mncc_state = state; return 0; } |