src: use namespace prefix osmo_signal*
Summary of changes: s/signal_cbfn/osmo_signal_cbfn/g s/register_signal_handler/osmo_signal_register_handler/g s/unregister_signal_handler/osmo_signal_unregister_handler/g s/dispatch_signal/osmo_signal_dispatch/g
This commit is contained in:
parent
4db9299286
commit
bbc5b99a6b
|
@ -98,7 +98,7 @@ static void signal_handler(int signal)
|
|||
|
||||
switch (signal) {
|
||||
case SIGINT:
|
||||
dispatch_signal(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL);
|
||||
osmo_signal_dispatch(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL);
|
||||
sleep(1);
|
||||
exit(0);
|
||||
break;
|
||||
|
@ -239,7 +239,7 @@ int main(int argc, char **argv)
|
|||
}
|
||||
gbcfg.nsi = bssgp_nsi;
|
||||
gprs_ns_vty_init(bssgp_nsi);
|
||||
register_signal_handler(SS_NS, &gbprox_signal, NULL);
|
||||
osmo_signal_register_handler(SS_NS, &gbprox_signal, NULL);
|
||||
|
||||
rc = gbproxy_parse_config(config_file, &gbcfg);
|
||||
if (rc < 0) {
|
||||
|
|
|
@ -105,7 +105,7 @@ static void signal_handler(int signal)
|
|||
|
||||
switch (signal) {
|
||||
case SIGINT:
|
||||
dispatch_signal(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL);
|
||||
osmo_signal_dispatch(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL);
|
||||
sleep(1);
|
||||
exit(0);
|
||||
break;
|
||||
|
|
|
@ -908,8 +908,8 @@ int main(int argc, char **argv)
|
|||
gsm_bts_trx_alloc(bts);
|
||||
bts->oml_tei = stream_id;
|
||||
|
||||
register_signal_handler(SS_NM, nm_sig_cb, NULL);
|
||||
register_signal_handler(SS_IPAC_NWL, nwl_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_IPAC_NWL, nwl_sig_cb, NULL);
|
||||
|
||||
ipac_nwl_init();
|
||||
|
||||
|
|
|
@ -222,7 +222,7 @@ static int test_rep(void *_msg)
|
|||
msg->trx->ipaccess.test_state = IPAC_TEST_S_IDLE;
|
||||
/* Send signal to notify higher layers of test completion */
|
||||
DEBUGP(DNM, "dispatching S_IPAC_NWL_COMPLETE signal\n");
|
||||
dispatch_signal(SS_IPAC_NWL, S_IPAC_NWL_COMPLETE, msg->trx);
|
||||
osmo_signal_dispatch(SS_IPAC_NWL, S_IPAC_NWL_COMPLETE, msg->trx);
|
||||
break;
|
||||
case NM_IPACC_TESTRES_PARTIAL:
|
||||
msg->trx->ipaccess.test_state = IPAC_TEST_S_PARTIAL;
|
||||
|
@ -247,5 +247,5 @@ static int nwl_sig_cb(unsigned int subsys, unsigned int signal,
|
|||
|
||||
void ipac_nwl_init(void)
|
||||
{
|
||||
register_signal_handler(SS_NM, nwl_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_NM, nwl_sig_cb, NULL);
|
||||
}
|
||||
|
|
|
@ -576,7 +576,7 @@ int e1inp_event(struct e1inp_ts *ts, int evt, uint8_t tei, uint8_t sapi)
|
|||
isd.sapi = sapi;
|
||||
|
||||
/* report further upwards */
|
||||
dispatch_signal(SS_INPUT, evt, &isd);
|
||||
osmo_signal_dispatch(SS_INPUT, evt, &isd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -612,7 +612,7 @@ int e1inp_line_update(struct e1inp_line *line)
|
|||
* configured */
|
||||
memset(&isd, 0, sizeof(isd));
|
||||
isd.line = line;
|
||||
dispatch_signal(SS_INPUT, S_INP_LINE_INIT, &isd);
|
||||
osmo_signal_dispatch(SS_INPUT, S_INP_LINE_INIT, &isd);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
@ -639,7 +639,7 @@ void e1inp_init(void)
|
|||
{
|
||||
tall_sigl_ctx = talloc_named_const(tall_bsc_ctx, 1,
|
||||
"e1inp_sign_link");
|
||||
register_signal_handler(SS_GLOBAL, e1i_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_GLOBAL, e1i_sig_cb, NULL);
|
||||
|
||||
e1inp_misdn_init();
|
||||
#ifdef HAVE_DAHDI_USER_H
|
||||
|
|
|
@ -83,11 +83,11 @@ static void handle_dahdi_exception(struct e1inp_ts *ts)
|
|||
switch (evt) {
|
||||
case DAHDI_EVENT_ALARM:
|
||||
/* we should notify the code that the line is gone */
|
||||
dispatch_signal(SS_INPUT, S_INP_LINE_ALARM, &isd);
|
||||
osmo_signal_dispatch(SS_INPUT, S_INP_LINE_ALARM, &isd);
|
||||
break;
|
||||
case DAHDI_EVENT_NOALARM:
|
||||
/* alarm has gone, we should re-start the SABM requests */
|
||||
dispatch_signal(SS_INPUT, S_INP_LINE_NOALARM, &isd);
|
||||
osmo_signal_dispatch(SS_INPUT, S_INP_LINE_NOALARM, &isd);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -701,7 +701,7 @@ static int update_admstate(struct gsm_bts *bts, uint8_t obj_class,
|
|||
nsd.old_state = nm_state;
|
||||
nsd.new_state = &new_state;
|
||||
nsd.obj_inst = obj_inst;
|
||||
dispatch_signal(SS_NM, S_NM_STATECHG_ADM, &nsd);
|
||||
osmo_signal_dispatch(SS_NM, S_NM_STATECHG_ADM, &nsd);
|
||||
|
||||
nm_state->administrative = adm_state;
|
||||
|
||||
|
@ -760,7 +760,7 @@ static int abis_nm_rx_statechg_rep(struct msgb *mb)
|
|||
nsd.new_state = &new_state;
|
||||
nsd.obj_inst = &foh->obj_inst;
|
||||
nsd.bts = bts;
|
||||
dispatch_signal(SS_NM, S_NM_STATECHG_OPER, &nsd);
|
||||
osmo_signal_dispatch(SS_NM, S_NM_STATECHG_OPER, &nsd);
|
||||
nm_state->operational = new_state.operational;
|
||||
nm_state->availability = new_state.availability;
|
||||
if (nm_state->administrative == 0)
|
||||
|
@ -827,15 +827,15 @@ static int abis_nm_rcvmsg_report(struct msgb *mb)
|
|||
break;
|
||||
case NM_MT_SW_ACTIVATED_REP:
|
||||
DEBUGPC(DNM, "Software Activated Report\n");
|
||||
dispatch_signal(SS_NM, S_NM_SW_ACTIV_REP, mb);
|
||||
osmo_signal_dispatch(SS_NM, S_NM_SW_ACTIV_REP, mb);
|
||||
break;
|
||||
case NM_MT_FAILURE_EVENT_REP:
|
||||
rx_fail_evt_rep(mb);
|
||||
dispatch_signal(SS_NM, S_NM_FAIL_REP, mb);
|
||||
osmo_signal_dispatch(SS_NM, S_NM_FAIL_REP, mb);
|
||||
break;
|
||||
case NM_MT_TEST_REP:
|
||||
DEBUGPC(DNM, "Test Report\n");
|
||||
dispatch_signal(SS_NM, S_NM_TEST_REP, mb);
|
||||
osmo_signal_dispatch(SS_NM, S_NM_TEST_REP, mb);
|
||||
break;
|
||||
default:
|
||||
DEBUGPC(DNM, "reporting NM MT 0x%02x\n", mt);
|
||||
|
@ -1043,7 +1043,7 @@ static int abis_nm_rcvmsg_fom(struct msgb *mb)
|
|||
|
||||
nack_data.msg = mb;
|
||||
nack_data.mt = mt;
|
||||
dispatch_signal(SS_NM, S_NM_NACK, &nack_data);
|
||||
osmo_signal_dispatch(SS_NM, S_NM_NACK, &nack_data);
|
||||
abis_nm_queue_send_next(mb->trx->bts);
|
||||
return 0;
|
||||
}
|
||||
|
@ -1078,10 +1078,10 @@ static int abis_nm_rcvmsg_fom(struct msgb *mb)
|
|||
DEBUGP(DNM, "CONN MDROP LINK ACK\n");
|
||||
break;
|
||||
case NM_MT_IPACC_RESTART_ACK:
|
||||
dispatch_signal(SS_NM, S_NM_IPACC_RESTART_ACK, NULL);
|
||||
osmo_signal_dispatch(SS_NM, S_NM_IPACC_RESTART_ACK, NULL);
|
||||
break;
|
||||
case NM_MT_IPACC_RESTART_NACK:
|
||||
dispatch_signal(SS_NM, S_NM_IPACC_RESTART_NACK, NULL);
|
||||
osmo_signal_dispatch(SS_NM, S_NM_IPACC_RESTART_NACK, NULL);
|
||||
break;
|
||||
case NM_MT_SET_BTS_ATTR_ACK:
|
||||
/* The HSL wants an OPSTART _after_ the SI has been set */
|
||||
|
@ -2884,12 +2884,12 @@ static int abis_nm_rx_ipacc(struct msgb *msg)
|
|||
case NM_MT_IPACC_GET_NVATTR_NACK:
|
||||
signal.trx = gsm_bts_trx_by_nr(msg->trx->bts, foh->obj_inst.trx_nr);
|
||||
signal.msg_type = foh->msg_type;
|
||||
dispatch_signal(SS_NM, S_NM_IPACC_NACK, &signal);
|
||||
osmo_signal_dispatch(SS_NM, S_NM_IPACC_NACK, &signal);
|
||||
break;
|
||||
case NM_MT_IPACC_SET_NVATTR_ACK:
|
||||
signal.trx = gsm_bts_trx_by_nr(msg->trx->bts, foh->obj_inst.trx_nr);
|
||||
signal.msg_type = foh->msg_type;
|
||||
dispatch_signal(SS_NM, S_NM_IPACC_ACK, &signal);
|
||||
osmo_signal_dispatch(SS_NM, S_NM_IPACC_ACK, &signal);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
|
|
@ -753,7 +753,7 @@ static void update_mo_state(struct gsm_bts *bts, struct abis_om2k_mo *mo,
|
|||
nsd.new_state = &new_state;
|
||||
nsd.om2k_mo = mo;
|
||||
|
||||
dispatch_signal(SS_NM, S_NM_STATECHG_ADM, &nsd);
|
||||
osmo_signal_dispatch(SS_NM, S_NM_STATECHG_ADM, &nsd);
|
||||
|
||||
nm_state->availability = new_state.availability;
|
||||
}
|
||||
|
@ -794,7 +794,7 @@ static void signal_op_state(struct gsm_bts *bts, struct abis_om2k_mo *mo)
|
|||
nsd.new_state = nm_state;
|
||||
nsd.om2k_mo = mo;
|
||||
|
||||
dispatch_signal(SS_NM, S_NM_STATECHG_OPER, &nsd);
|
||||
osmo_signal_dispatch(SS_NM, S_NM_STATECHG_OPER, &nsd);
|
||||
}
|
||||
|
||||
static int abis_om2k_sendmsg(struct gsm_bts *bts, struct msgb *msg)
|
||||
|
@ -1434,7 +1434,7 @@ static int process_conf_res(struct gsm_bts *bts, struct msgb *msg)
|
|||
nsd.obj = mo2obj(bts, &o2h->mo);
|
||||
nsd.om2k_mo = &o2h->mo;
|
||||
nsd.accordance_ind = acc;
|
||||
dispatch_signal(SS_NM, S_NM_OM2K_CONF_RES, &nsd);
|
||||
osmo_signal_dispatch(SS_NM, S_NM_OM2K_CONF_RES, &nsd);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
@ -55,7 +55,7 @@ static void send_lchan_signal(int sig_no, struct gsm_lchan *lchan,
|
|||
struct lchan_signal_data sig;
|
||||
sig.lchan = lchan;
|
||||
sig.mr = resp;
|
||||
dispatch_signal(SS_LCHAN, sig_no, &sig);
|
||||
osmo_signal_dispatch(SS_LCHAN, sig_no, &sig);
|
||||
}
|
||||
|
||||
static uint8_t mdisc_by_msgtype(uint8_t msg_type)
|
||||
|
@ -1806,7 +1806,7 @@ static int abis_rsl_rx_ipacc_crcx_ack(struct msgb *msg)
|
|||
|
||||
ipac_parse_rtp(lchan, &tv);
|
||||
|
||||
dispatch_signal(SS_ABISIP, S_ABISIP_CRCX_ACK, msg->lchan);
|
||||
osmo_signal_dispatch(SS_ABISIP, S_ABISIP_CRCX_ACK, msg->lchan);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -1823,7 +1823,7 @@ static int abis_rsl_rx_ipacc_mdcx_ack(struct msgb *msg)
|
|||
|
||||
rsl_tlv_parse(&tv, dh->data, msgb_l2len(msg)-sizeof(*dh));
|
||||
ipac_parse_rtp(lchan, &tv);
|
||||
dispatch_signal(SS_ABISIP, S_ABISIP_MDCX_ACK, msg->lchan);
|
||||
osmo_signal_dispatch(SS_ABISIP, S_ABISIP_MDCX_ACK, msg->lchan);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -1839,7 +1839,7 @@ static int abis_rsl_rx_ipacc_dlcx_ind(struct msgb *msg)
|
|||
print_rsl_cause(LOGL_DEBUG, TLVP_VAL(&tv, RSL_IE_CAUSE),
|
||||
TLVP_LEN(&tv, RSL_IE_CAUSE));
|
||||
|
||||
dispatch_signal(SS_ABISIP, S_ABISIP_DLCX_IND, msg->lchan);
|
||||
osmo_signal_dispatch(SS_ABISIP, S_ABISIP_DLCX_IND, msg->lchan);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -671,5 +671,5 @@ static void handle_chan_nack(struct gsm_subscriber_connection *conn,
|
|||
|
||||
static __attribute__((constructor)) void on_dso_load_bsc(void)
|
||||
{
|
||||
register_signal_handler(SS_LCHAN, bsc_handle_lchan_signal, NULL);
|
||||
osmo_signal_register_handler(SS_LCHAN, bsc_handle_lchan_signal, NULL);
|
||||
}
|
||||
|
|
|
@ -82,7 +82,7 @@ int bsc_shutdown_net(struct gsm_network *net)
|
|||
|
||||
llist_for_each_entry(bts, &net->bts_list, list) {
|
||||
LOGP(DNM, LOGL_NOTICE, "shutting down OML for BTS %u\n", bts->nr);
|
||||
dispatch_signal(SS_GLOBAL, S_GLOBAL_BTS_CLOSE_OM, bts);
|
||||
osmo_signal_dispatch(SS_GLOBAL, S_GLOBAL_BTS_CLOSE_OM, bts);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -434,8 +434,8 @@ int bsc_bootstrap_network(int (*mncc_recv)(struct gsm_network *, struct msgb *),
|
|||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
register_signal_handler(SS_NM, nm_sig_cb, NULL);
|
||||
register_signal_handler(SS_INPUT, inp_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_INPUT, inp_sig_cb, NULL);
|
||||
|
||||
llist_for_each_entry(bts, &bsc_gsmnet->bts_list, list) {
|
||||
rc = bootstrap_bts(bts);
|
||||
|
|
|
@ -137,5 +137,5 @@ static int rll_lchan_signal(unsigned int subsys, unsigned int signal,
|
|||
|
||||
static __attribute__((constructor)) void on_dso_load_rll(void)
|
||||
{
|
||||
register_signal_handler(SS_CHALLOC, rll_lchan_signal, NULL);
|
||||
osmo_signal_register_handler(SS_CHALLOC, rll_lchan_signal, NULL);
|
||||
}
|
||||
|
|
|
@ -257,9 +257,9 @@ int bts_model_rbs2k_init(void)
|
|||
gsm_btsmodel_set_feature(&model_rbs2k, BTS_FEAT_HOPPING);
|
||||
gsm_btsmodel_set_feature(&model_rbs2k, BTS_FEAT_HSCSD);
|
||||
|
||||
register_signal_handler(SS_INPUT, inp_sig_cb, NULL);
|
||||
register_signal_handler(SS_GLOBAL, gbl_sig_cb, NULL);
|
||||
register_signal_handler(SS_NM, nm_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_INPUT, inp_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_GLOBAL, gbl_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL);
|
||||
|
||||
return gsm_bts_model_register(&model_rbs2k);
|
||||
}
|
||||
|
|
|
@ -156,7 +156,7 @@ int bts_model_hslfemto_init(void)
|
|||
gsm_btsmodel_set_feature(&model_hslfemto, BTS_FEAT_GPRS);
|
||||
gsm_btsmodel_set_feature(&model_hslfemto, BTS_FEAT_EGPRS);
|
||||
|
||||
register_signal_handler(SS_INPUT, inp_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_INPUT, inp_sig_cb, NULL);
|
||||
|
||||
return gsm_bts_model_register(&model_hslfemto);
|
||||
}
|
||||
|
|
|
@ -443,7 +443,7 @@ int bts_model_nanobts_init(void)
|
|||
gsm_btsmodel_set_feature(&model_nanobts, BTS_FEAT_GPRS);
|
||||
gsm_btsmodel_set_feature(&model_nanobts, BTS_FEAT_EGPRS);
|
||||
|
||||
register_signal_handler(SS_NM, nm_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL);
|
||||
|
||||
return gsm_bts_model_register(&model_nanobts);
|
||||
}
|
||||
|
|
|
@ -583,8 +583,8 @@ int bts_model_bs11_init(void)
|
|||
gsm_btsmodel_set_feature(&model_bs11, BTS_FEAT_HOPPING);
|
||||
gsm_btsmodel_set_feature(&model_bs11, BTS_FEAT_HSCSD);
|
||||
|
||||
register_signal_handler(SS_INPUT, inp_sig_cb, NULL);
|
||||
register_signal_handler(SS_GLOBAL, gbl_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_INPUT, inp_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_GLOBAL, gbl_sig_cb, NULL);
|
||||
|
||||
return gsm_bts_model_register(&model_bs11);
|
||||
}
|
||||
|
|
|
@ -284,7 +284,7 @@ struct gsm_lchan *lchan_alloc(struct gsm_bts *bts, enum gsm_chan_t type,
|
|||
struct challoc_signal_data sig;
|
||||
sig.bts = bts;
|
||||
sig.type = type;
|
||||
dispatch_signal(SS_CHALLOC, S_CHALLOC_ALLOC_FAIL, &sig);
|
||||
osmo_signal_dispatch(SS_CHALLOC, S_CHALLOC_ALLOC_FAIL, &sig);
|
||||
}
|
||||
|
||||
return lchan;
|
||||
|
@ -306,7 +306,7 @@ void lchan_free(struct gsm_lchan *lchan)
|
|||
/* We might kill an active channel... */
|
||||
sig.lchan = lchan;
|
||||
sig.mr = NULL;
|
||||
dispatch_signal(SS_LCHAN, S_LCHAN_UNEXPECTED_RELEASE, &sig);
|
||||
osmo_signal_dispatch(SS_LCHAN, S_LCHAN_UNEXPECTED_RELEASE, &sig);
|
||||
}
|
||||
|
||||
|
||||
|
@ -330,7 +330,7 @@ void lchan_free(struct gsm_lchan *lchan)
|
|||
|
||||
sig.lchan = lchan;
|
||||
sig.bts = lchan->ts->trx->bts;
|
||||
dispatch_signal(SS_CHALLOC, S_CHALLOC_FREED, &sig);
|
||||
osmo_signal_dispatch(SS_CHALLOC, S_CHALLOC_FREED, &sig);
|
||||
|
||||
if (lchan->conn) {
|
||||
LOGP(DRLL, LOGL_ERROR, "the subscriber connection should be gone.\n");
|
||||
|
|
|
@ -293,5 +293,5 @@ static int ho_dec_sig_cb(unsigned int subsys, unsigned int signal,
|
|||
|
||||
void on_dso_load_ho_dec(void)
|
||||
{
|
||||
register_signal_handler(SS_LCHAN, ho_dec_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_LCHAN, ho_dec_sig_cb, NULL);
|
||||
}
|
||||
|
|
|
@ -344,7 +344,7 @@ static int ho_ipac_crcx_ack(struct gsm_lchan *new_lchan)
|
|||
|
||||
sig_ho.old_lchan = ho->old_lchan;
|
||||
sig_ho.new_lchan = new_lchan;
|
||||
dispatch_signal(SS_HO, S_HANDOVER_ACK, &sig_ho);
|
||||
osmo_signal_dispatch(SS_HO, S_HANDOVER_ACK, &sig_ho);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -388,6 +388,6 @@ static int ho_logic_sig_cb(unsigned int subsys, unsigned int signal,
|
|||
|
||||
static __attribute__((constructor)) void on_dso_load_ho_logic(void)
|
||||
{
|
||||
register_signal_handler(SS_LCHAN, ho_logic_sig_cb, NULL);
|
||||
register_signal_handler(SS_ABISIP, ho_logic_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_LCHAN, ho_logic_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_ABISIP, ho_logic_sig_cb, NULL);
|
||||
}
|
||||
|
|
|
@ -80,5 +80,5 @@ static int meas_proc_sig_cb(unsigned int subsys, unsigned int signal,
|
|||
|
||||
static __attribute__((constructor)) void on_dso_load_meas(void)
|
||||
{
|
||||
register_signal_handler(SS_LCHAN, meas_proc_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_LCHAN, meas_proc_sig_cb, NULL);
|
||||
}
|
||||
|
|
|
@ -172,7 +172,7 @@ void nsvc_delete(struct gprs_nsvc *nsvc)
|
|||
talloc_free(nsvc);
|
||||
}
|
||||
|
||||
static void ns_dispatch_signal(struct gprs_nsvc *nsvc, unsigned int signal,
|
||||
static void ns_osmo_signal_dispatch(struct gprs_nsvc *nsvc, unsigned int signal,
|
||||
uint8_t cause)
|
||||
{
|
||||
struct ns_signal_data nssd;
|
||||
|
@ -180,7 +180,7 @@ static void ns_dispatch_signal(struct gprs_nsvc *nsvc, unsigned int signal,
|
|||
nssd.nsvc = nsvc;
|
||||
nssd.cause = cause;
|
||||
|
||||
dispatch_signal(SS_NS, signal, &nssd);
|
||||
osmo_signal_dispatch(SS_NS, signal, &nssd);
|
||||
}
|
||||
|
||||
/* Section 10.3.2, Table 13 */
|
||||
|
@ -437,8 +437,8 @@ static void gprs_ns_timer_cb(void *data)
|
|||
"NSEI=%u Tns-alive expired more then "
|
||||
"%u times, blocking NS-VC\n", nsvc->nsei,
|
||||
nsvc->nsi->timeout[NS_TOUT_TNS_ALIVE_RETRIES]);
|
||||
ns_dispatch_signal(nsvc, S_NS_ALIVE_EXP, 0);
|
||||
ns_dispatch_signal(nsvc, S_NS_BLOCK, NS_CAUSE_NSVC_BLOCKED);
|
||||
ns_osmo_signal_dispatch(nsvc, S_NS_ALIVE_EXP, 0);
|
||||
ns_osmo_signal_dispatch(nsvc, S_NS_BLOCK, NS_CAUSE_NSVC_BLOCKED);
|
||||
return;
|
||||
}
|
||||
/* Tns-test case: send NS-ALIVE PDU */
|
||||
|
@ -631,7 +631,7 @@ static int gprs_ns_rx_reset(struct gprs_nsvc *nsvc, struct msgb *msg)
|
|||
|
||||
/* inform interested parties about the fact that this NSVC
|
||||
* has received RESET */
|
||||
ns_dispatch_signal(nsvc, S_NS_RESET, *cause);
|
||||
ns_osmo_signal_dispatch(nsvc, S_NS_RESET, *cause);
|
||||
|
||||
return gprs_ns_tx_reset_ack(nsvc);
|
||||
}
|
||||
|
@ -665,7 +665,7 @@ static int gprs_ns_rx_block(struct gprs_nsvc *nsvc, struct msgb *msg)
|
|||
cause = (uint8_t *) TLVP_VAL(&tp, NS_IE_CAUSE);
|
||||
//nsvci = (uint16_t *) TLVP_VAL(&tp, NS_IE_VCI);
|
||||
|
||||
ns_dispatch_signal(nsvc, S_NS_BLOCK, *cause);
|
||||
ns_osmo_signal_dispatch(nsvc, S_NS_BLOCK, *cause);
|
||||
rate_ctr_inc(&nsvc->ctrg->ctr[NS_CTR_BLOCKED]);
|
||||
|
||||
return gprs_ns_tx_simple(nsvc, NS_PDUT_BLOCK_ACK);
|
||||
|
@ -796,7 +796,7 @@ int gprs_ns_rcvmsg(struct gprs_ns_inst *nsi, struct msgb *msg,
|
|||
/* Section 7.2: unblocking procedure */
|
||||
LOGP(DNS, LOGL_INFO, "NSEI=%u Rx NS UNBLOCK\n", nsvc->nsei);
|
||||
nsvc->state &= ~NSE_S_BLOCKED;
|
||||
ns_dispatch_signal(nsvc, S_NS_UNBLOCK, 0);
|
||||
ns_osmo_signal_dispatch(nsvc, S_NS_UNBLOCK, 0);
|
||||
rc = gprs_ns_tx_simple(nsvc, NS_PDUT_UNBLOCK_ACK);
|
||||
break;
|
||||
case NS_PDUT_UNBLOCK_ACK:
|
||||
|
@ -804,7 +804,7 @@ int gprs_ns_rcvmsg(struct gprs_ns_inst *nsi, struct msgb *msg,
|
|||
/* mark NS-VC as unblocked + active */
|
||||
nsvc->state = NSE_S_ALIVE;
|
||||
nsvc->remote_state = NSE_S_ALIVE;
|
||||
ns_dispatch_signal(nsvc, S_NS_UNBLOCK, 0);
|
||||
ns_osmo_signal_dispatch(nsvc, S_NS_UNBLOCK, 0);
|
||||
break;
|
||||
case NS_PDUT_BLOCK:
|
||||
rc = gprs_ns_rx_block(nsvc, msg);
|
||||
|
|
|
@ -439,7 +439,7 @@ static int mm_rx_id_resp(struct gsm_subscriber_connection *conn, struct msgb *ms
|
|||
DEBUGP(DMM, "IDENTITY RESPONSE: mi_type=0x%02x MI(%s)\n",
|
||||
mi_type, mi_string);
|
||||
|
||||
dispatch_signal(SS_SUBSCR, S_SUBSCR_IDENTITY, gh->data);
|
||||
osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, gh->data);
|
||||
|
||||
switch (mi_type) {
|
||||
case GSM_MI_TYPE_IMSI:
|
||||
|
@ -520,7 +520,7 @@ static int mm_rx_loc_upd_req(struct gsm_subscriber_connection *conn, struct msgb
|
|||
DEBUGPC(DMM, "mi_type=0x%02x MI(%s) type=%s ", mi_type, mi_string,
|
||||
lupd_name(lu->type));
|
||||
|
||||
dispatch_signal(SS_SUBSCR, S_SUBSCR_IDENTITY, &lu->mi_len);
|
||||
osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, &lu->mi_len);
|
||||
|
||||
switch (lu->type) {
|
||||
case GSM48_LUPD_NORMAL:
|
||||
|
@ -842,7 +842,7 @@ static int gsm48_rx_mm_serv_req(struct gsm_subscriber_connection *conn, struct m
|
|||
DEBUGPC(DMM, "serv_type=0x%02x mi_type=0x%02x M(%s)\n",
|
||||
req->cm_service_type, mi_type, mi_string);
|
||||
|
||||
dispatch_signal(SS_SUBSCR, S_SUBSCR_IDENTITY, (classmark2 + classmark2_len));
|
||||
osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_IDENTITY, (classmark2 + classmark2_len));
|
||||
|
||||
if (is_siemens_bts(bts))
|
||||
send_siemens_mrpci(msg->lchan, classmark2-1);
|
||||
|
@ -1190,7 +1190,7 @@ static int gsm48_rx_rr_ho_compl(struct msgb *msg)
|
|||
|
||||
sig.lchan = msg->lchan;
|
||||
sig.mr = NULL;
|
||||
dispatch_signal(SS_LCHAN, S_LCHAN_HANDOVER_COMPL, &sig);
|
||||
osmo_signal_dispatch(SS_LCHAN, S_LCHAN_HANDOVER_COMPL, &sig);
|
||||
/* FIXME: release old channel */
|
||||
|
||||
return 0;
|
||||
|
@ -1207,7 +1207,7 @@ static int gsm48_rx_rr_ho_fail(struct msgb *msg)
|
|||
|
||||
sig.lchan = msg->lchan;
|
||||
sig.mr = NULL;
|
||||
dispatch_signal(SS_LCHAN, S_LCHAN_HANDOVER_FAIL, &sig);
|
||||
osmo_signal_dispatch(SS_LCHAN, S_LCHAN_HANDOVER_FAIL, &sig);
|
||||
/* FIXME: release allocated new channel */
|
||||
|
||||
return 0;
|
||||
|
@ -3343,6 +3343,6 @@ int gsm0408_dispatch(struct gsm_subscriber_connection *conn, struct msgb *msg)
|
|||
*/
|
||||
static __attribute__((constructor)) void on_dso_load_0408(void)
|
||||
{
|
||||
register_signal_handler(SS_HO, handle_ho_signal, NULL);
|
||||
register_signal_handler(SS_ABISIP, handle_abisip_signal, NULL);
|
||||
osmo_signal_register_handler(SS_HO, handle_ho_signal, NULL);
|
||||
osmo_signal_register_handler(SS_ABISIP, handle_abisip_signal, NULL);
|
||||
}
|
||||
|
|
|
@ -151,7 +151,7 @@ static void send_signal(int sig_no,
|
|||
sig.trans = trans;
|
||||
sig.sms = sms;
|
||||
sig.paging_result = paging_result;
|
||||
dispatch_signal(SS_SMS, sig_no, &sig);
|
||||
osmo_signal_dispatch(SS_SMS, sig_no, &sig);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -97,7 +97,7 @@ static int subscr_paging_dispatch(unsigned int hooknum, unsigned int event,
|
|||
sig_data.bts = conn ? conn->bts : NULL;
|
||||
sig_data.conn = conn;
|
||||
sig_data.paging_result = event;
|
||||
dispatch_signal(
|
||||
osmo_signal_dispatch(
|
||||
SS_PAGING,
|
||||
event == GSM_PAGING_SUCCEEDED ?
|
||||
S_PAGING_SUCCEEDED : S_PAGING_EXPIRED,
|
||||
|
@ -337,7 +337,7 @@ int subscr_update(struct gsm_subscriber *s, struct gsm_bts *bts, int reason)
|
|||
subscr_name(s), s->lac);
|
||||
rc = db_sync_subscriber(s);
|
||||
db_subscriber_update(s);
|
||||
dispatch_signal(SS_SUBSCR, S_SUBSCR_ATTACHED, s);
|
||||
osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_ATTACHED, s);
|
||||
break;
|
||||
case GSM_SUBSCRIBER_UPDATE_DETACHED:
|
||||
/* Only detach if we are currently in this area */
|
||||
|
@ -346,7 +346,7 @@ int subscr_update(struct gsm_subscriber *s, struct gsm_bts *bts, int reason)
|
|||
LOGP(DMM, LOGL_INFO, "Subscriber %s DETACHED\n", subscr_name(s));
|
||||
rc = db_sync_subscriber(s);
|
||||
db_subscriber_update(s);
|
||||
dispatch_signal(SS_SUBSCR, S_SUBSCR_DETACHED, s);
|
||||
osmo_signal_dispatch(SS_SUBSCR, S_SUBSCR_DETACHED, s);
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "subscr_update with unknown reason: %d\n",
|
||||
|
|
|
@ -99,6 +99,6 @@ static int paging_sig_cb(unsigned int subsys, unsigned int signal,
|
|||
|
||||
void on_dso_load_rrlp(void)
|
||||
{
|
||||
register_signal_handler(SS_SUBSCR, subscr_sig_cb, NULL);
|
||||
register_signal_handler(SS_PAGING, paging_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_SUBSCR, subscr_sig_cb, NULL);
|
||||
osmo_signal_register_handler(SS_PAGING, paging_sig_cb, NULL);
|
||||
}
|
||||
|
|
|
@ -56,13 +56,13 @@ static int paging_cb_silent(unsigned int hooknum, unsigned int event,
|
|||
conn->lchan->ts->nr, conn->lchan->ts->trx->arfcn);
|
||||
conn->silent_call = 1;
|
||||
/* increment lchan reference count */
|
||||
dispatch_signal(SS_SCALL, S_SCALL_SUCCESS, &sigdata);
|
||||
osmo_signal_dispatch(SS_SCALL, S_SCALL_SUCCESS, &sigdata);
|
||||
break;
|
||||
case GSM_PAGING_EXPIRED:
|
||||
case GSM_PAGING_BUSY:
|
||||
case GSM_PAGING_OOM:
|
||||
DEBUGP(DSMS, "expired\n");
|
||||
dispatch_signal(SS_SCALL, S_SCALL_EXPIRED, &sigdata);
|
||||
osmo_signal_dispatch(SS_SCALL, S_SCALL_EXPIRED, &sigdata);
|
||||
break;
|
||||
default:
|
||||
rc = -EINVAL;
|
||||
|
|
|
@ -303,8 +303,8 @@ int sms_queue_start(struct gsm_network *network, int max_pending)
|
|||
return -1;
|
||||
}
|
||||
|
||||
register_signal_handler(SS_SUBSCR, sms_subscr_cb, network);
|
||||
register_signal_handler(SS_SMS, sms_sms_cb, network);
|
||||
osmo_signal_register_handler(SS_SUBSCR, sms_subscr_cb, network);
|
||||
osmo_signal_register_handler(SS_SMS, sms_sms_cb, network);
|
||||
|
||||
network->sms_queue = sms;
|
||||
INIT_LLIST_HEAD(&sms->pending_sms);
|
||||
|
|
|
@ -148,6 +148,6 @@ static int token_sms_cb(unsigned int subsys, unsigned int signal,
|
|||
//static __attribute__((constructor)) void on_dso_load_token(void)
|
||||
void on_dso_load_token(void)
|
||||
{
|
||||
register_signal_handler(SS_SUBSCR, token_subscr_cb, NULL);
|
||||
register_signal_handler(SS_SMS, token_sms_cb, NULL);
|
||||
osmo_signal_register_handler(SS_SUBSCR, token_subscr_cb, NULL);
|
||||
osmo_signal_register_handler(SS_SMS, token_sms_cb, NULL);
|
||||
}
|
||||
|
|
|
@ -764,7 +764,7 @@ DEFUN(smsqueue_fail,
|
|||
|
||||
int bsc_vty_init_extra(void)
|
||||
{
|
||||
register_signal_handler(SS_SCALL, scall_cbfn, NULL);
|
||||
osmo_signal_register_handler(SS_SCALL, scall_cbfn, NULL);
|
||||
|
||||
install_element_ve(&show_subscr_cmd);
|
||||
install_element_ve(&show_subscr_cache_cmd);
|
||||
|
|
|
@ -65,6 +65,6 @@ static int handle_abisip_signal(unsigned int subsys, unsigned int signal,
|
|||
int osmo_bsc_audio_init(struct gsm_network *net)
|
||||
{
|
||||
net->hardcoded_rtp_payload = 98;
|
||||
register_signal_handler(SS_ABISIP, handle_abisip_signal, net);
|
||||
osmo_signal_register_handler(SS_ABISIP, handle_abisip_signal, net);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -103,5 +103,5 @@ static int handle_rf_signal(unsigned int subsys, unsigned int signal,
|
|||
|
||||
static __attribute__((constructor)) void on_dso_load_grace(void)
|
||||
{
|
||||
register_signal_handler(SS_RF, handle_rf_signal, NULL);
|
||||
osmo_signal_register_handler(SS_RF, handle_rf_signal, NULL);
|
||||
}
|
||||
|
|
|
@ -149,7 +149,7 @@ static void signal_handler(int signal)
|
|||
switch (signal) {
|
||||
case SIGINT:
|
||||
bsc_shutdown_net(bsc_gsmnet);
|
||||
dispatch_signal(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL);
|
||||
osmo_signal_dispatch(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL);
|
||||
sleep(3);
|
||||
exit(0);
|
||||
break;
|
||||
|
|
|
@ -306,7 +306,7 @@ static void msc_connection_connected(struct bsc_msc_connection *con)
|
|||
msc_ping_timeout_cb(data);
|
||||
|
||||
sig.data = data;
|
||||
dispatch_signal(SS_MSC, S_MSC_CONNECTED, &sig);
|
||||
osmo_signal_dispatch(SS_MSC, S_MSC_CONNECTED, &sig);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -325,7 +325,7 @@ static void msc_connection_was_lost(struct bsc_msc_connection *msc)
|
|||
osmo_timer_del(&data->pong_timer);
|
||||
|
||||
sig.data = data;
|
||||
dispatch_signal(SS_MSC, S_MSC_LOST, &sig);
|
||||
osmo_signal_dispatch(SS_MSC, S_MSC_LOST, &sig);
|
||||
|
||||
msc->is_authenticated = 0;
|
||||
bsc_msc_schedule_connect(msc);
|
||||
|
|
|
@ -137,7 +137,7 @@ static void send_signal(struct osmo_bsc_rf *rf, int val)
|
|||
sig.net = rf->gsm_network;
|
||||
|
||||
rf->policy = val;
|
||||
dispatch_signal(SS_RF, val, &sig);
|
||||
osmo_signal_dispatch(SS_RF, val, &sig);
|
||||
}
|
||||
|
||||
static int switch_rf_off(struct osmo_bsc_rf *rf)
|
||||
|
|
|
@ -282,7 +282,7 @@ int osmo_bsc_sccp_init(struct gsm_network *gsmnet)
|
|||
sccp_connection_set_incoming(&sccp_ssn_bssap, msc_sccp_accept, NULL);
|
||||
sccp_set_read(&sccp_ssn_bssap, msc_sccp_read, gsmnet);
|
||||
|
||||
register_signal_handler(SS_MSC, handle_msc_signal, gsmnet);
|
||||
osmo_signal_register_handler(SS_MSC, handle_msc_signal, gsmnet);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -175,7 +175,7 @@ static void signal_handler(int signal)
|
|||
switch (signal) {
|
||||
case SIGINT:
|
||||
bsc_shutdown_net(bsc_gsmnet);
|
||||
dispatch_signal(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL);
|
||||
osmo_signal_dispatch(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL);
|
||||
sleep(3);
|
||||
exit(0);
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue