baseband-devel January 2011

baseband-devel@lists.osmocom.org

71 participants
98 discussions

[RFC] simplify intra-mobile event passing

by Harald Welte

Hi! I've been playing with some code earlier today, trying to reuse the RR implementation of 'mobile' but without 'MM' and '03.22' code. Next step was to play with RR+MM but without 03.22. Both were not that easy to do, given the various different function calls between those modules. While trying to resolve it, I discovered that we have many sequences like gsm322_msgb_alloc() followed by some error checking and a final gsm322_plmn_senmsg(). Similar pattersn could be seen for gsm48_mmevent. I've tried to simplify/unify this code a bit, as you can see from the attached patches (also in laforge/mobile_event branch). It's not tested yet, but I would like to get some comments on it. Initially I thought to use libosmocore signal code, but then signals are _emitted_, and they don't fit the picture where we have some incoming events into e.g. 03.22 code - as all the events are already labelled GSM322 and thus by the recipient, not its originator. So now there is one gsm322_event_input() and a gsm48_mmevent_input() function each. Somebody who wants to reuse partial 'mobile' code can simply provide stub functions for either one of those (or both)... The goal of this exercise is to have a tool that can open a dedicated channel to a user-specified cell and then send user-specified messages while optionally taking care of loc upd / auth / ciphering in order to make the network happy. Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

14 years, 5 months

[PATCH 3/3] [mobile] introduce and use gsm48_mmevevent_input()

by Harald Welte

... instead of using sequences of gsm48_mmevent_msgb_alloc() followed by gsm48_mmevent_msg() --- .../layer23/include/osmocom/bb/mobile/gsm48_mm.h | 4 +- src/host/layer23/src/mobile/app_mobile.c | 5 +-- src/host/layer23/src/mobile/gsm322.c | 41 +++----------------- src/host/layer23/src/mobile/gsm48_mm.c | 41 ++++++++++++-------- src/host/layer23/src/mobile/gsm48_rr.c | 6 +-- src/host/layer23/src/mobile/subscriber.c | 31 +++------------ 6 files changed, 41 insertions(+), 87 deletions(-) diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h index 447dc95..c141d5c 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h @@ -210,8 +210,8 @@ struct gsm48_mm_conn { int gsm48_mm_init(struct osmocom_ms *ms); int gsm48_mm_exit(struct osmocom_ms *ms); struct msgb *gsm48_mmr_msgb_alloc(int msg_type); -struct msgb *gsm48_mmevent_msgb_alloc(int msg_type); -int gsm48_mmevent_msg(struct osmocom_ms *ms, struct msgb *msg); +int gsm48_mmevent_input(struct osmocom_ms *ms, int msg_type, + const uint8_t *data, unsigned int len); int gsm48_mmr_downmsg(struct osmocom_ms *ms, struct msgb *msg); int gsm48_rr_dequeue(struct osmocom_ms *ms); int gsm48_mmxx_dequeue(struct osmocom_ms *ms); diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index b3c3284..4e6a803 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -124,10 +124,7 @@ int mobile_exit(struct osmocom_ms *ms, int force) struct msgb *nmsg; ms->shutdown = 1; /* going down */ - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_IMSI_DETACH); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(mm->ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_IMSI_DETACH, NULL, 0); return -EBUSY; } diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 3243afc..60b24cb 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -1174,17 +1174,12 @@ static int gsm322_a_hplmn_search_start(struct osmocom_ms *ms, struct msgb *msg) /* manual mode selected */ static int gsm322_a_sel_manual(struct osmocom_ms *ms, struct msgb *msg) { - struct msgb *nmsg; - /* restart state machine */ gsm322_a_switch_off(ms, msg); ms->settings.plmn_mode = PLMN_MODE_MANUAL; gsm322_m_switch_on(ms, msg); - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_USER_PLMN_SEL); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_USER_PLMN_SEL, NULL, 0); return 0; } @@ -1461,17 +1456,12 @@ static int gsm322_m_choose_plmn(struct osmocom_ms *ms, struct msgb *msg) /* auto mode selected */ static int gsm322_m_sel_auto(struct osmocom_ms *ms, struct msgb *msg) { - struct msgb *nmsg; - /* restart state machine */ gsm322_m_switch_off(ms, msg); ms->settings.plmn_mode = PLMN_MODE_AUTO; gsm322_a_switch_on(ms, msg); - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_USER_PLMN_SEL); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_USER_PLMN_SEL, NULL, 0); return 0; } @@ -2684,14 +2674,8 @@ static int gsm322_c_any_cell_sel(struct osmocom_ms *ms, struct msgb *msg) /* after re-selection, indicate no cell found */ if (cs->state == GSM322_C6_ANY_CELL_SEL || cs->state == GSM322_C8_ANY_CELL_RESEL) { - struct msgb *nmsg; - /* tell that we have no cell found */ - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_NO_CELL_FOUND); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(ms, nmsg); - + gsm48_mmevent_input(ms, GSM48_MM_EVENT_NO_CELL_FOUND, NULL, 0); } else { new_c_state(cs, GSM322_C6_ANY_CELL_SEL); } @@ -2737,7 +2721,6 @@ static int gsm322_c_any_cell_resel(struct osmocom_ms *ms, struct msgb *msg) static int gsm322_c_camp_normally(struct osmocom_ms *ms, struct msgb *msg) { struct gsm322_cellsel *cs = &ms->cellsel; - struct msgb *nmsg; LOGP(DSUM, LOGL_INFO, "Camping normally on cell (arfcn=%d mcc=%s " "mnc=%s %s, %s)\n", cs->sel_arfcn, gsm_print_mcc(cs->sel_mcc), @@ -2745,10 +2728,7 @@ static int gsm322_c_camp_normally(struct osmocom_ms *ms, struct msgb *msg) gsm_get_mnc(cs->sel_mcc, cs->sel_mnc)); /* tell that we have selected a (new) cell */ - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_CELL_SELECTED); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_CELL_SELECTED, NULL, 0); new_c_state(cs, GSM322_C3_CAMPED_NORMALLY); @@ -2759,7 +2739,6 @@ static int gsm322_c_camp_normally(struct osmocom_ms *ms, struct msgb *msg) static int gsm322_c_camp_any_cell(struct osmocom_ms *ms, struct msgb *msg) { struct gsm322_cellsel *cs = &ms->cellsel; - struct msgb *nmsg; LOGP(DSUM, LOGL_INFO, "Camping on any cell (arfcn=%d mcc=%s " "mnc=%s %s, %s)\n", cs->sel_arfcn, gsm_print_mcc(cs->sel_mcc), @@ -2768,10 +2747,7 @@ static int gsm322_c_camp_any_cell(struct osmocom_ms *ms, struct msgb *msg) /* tell that we have selected a (new) cell */ - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_CELL_SELECTED); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_CELL_SELECTED, NULL, 0); new_c_state(cs, GSM322_C7_CAMPED_ANY_CELL); @@ -2878,8 +2854,6 @@ static int gsm322_c_choose_cell(struct osmocom_ms *ms, struct msgb *msg) /* After location updating, we choose the last cell */ if (gm->same_cell) { - struct msgb *nmsg; - if (!cs->selected) { printf("No cell selected when ret.idle, please fix!\n"); exit(0L); @@ -2896,10 +2870,7 @@ static int gsm322_c_choose_cell(struct osmocom_ms *ms, struct msgb *msg) new_c_state(cs, GSM322_C3_CAMPED_NORMALLY); /* tell that we have selected the cell, so RR returns IDLE */ - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_CELL_SELECTED); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_CELL_SELECTED, NULL, 0); return 0; } diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 4652f34..6400373 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -658,7 +658,7 @@ struct msgb *gsm48_mmxx_msgb_alloc(int msg_type, uint32_t ref, } /* allocate MM event message */ -struct msgb *gsm48_mmevent_msgb_alloc(int msg_type) +static struct msgb *gsm48_mmevent_msgb_alloc(int msg_type) { struct msgb *msg; struct gsm48_mm_event *mme; @@ -710,7 +710,7 @@ int gsm48_mmr_downmsg(struct osmocom_ms *ms, struct msgb *msg) } /* queue MM event message */ -int gsm48_mmevent_msg(struct osmocom_ms *ms, struct msgb *msg) +static int gsm48_mmevent_msg(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; @@ -905,14 +905,10 @@ static void new_mm_state(struct gsm48_mmlayer *mm, int state, int substate) /* resend detach event, if flag is set */ if (state == GSM48_MM_ST_MM_IDLE && mm->delay_detach) { - struct msgb *nmsg; - mm->delay_detach = 0; - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_IMSI_DETACH); - if (!nmsg) - return; - gsm48_mmevent_msg(mm->ms, nmsg); + gsm48_mmevent_input(mm->ms, GSM48_MM_EVENT_IMSI_DETACH, + NULL, 0); } /* 4.4.2 start T3212 in MM IDLE mode if not started or has expired */ @@ -2431,7 +2427,8 @@ static int gsm48_mm_rel_loc_upd_rej(struct osmocom_ms *ms, struct msgb *msg) } memset(&ngm, 0, sizeof(ngm)); ngm.reject = mm->lupd_rej_cause; - gsm322_event_input(ms, GSM322_EVT_PLMN, msg_type, &ngm, sizeof(ngm)); + gsm322_event_input(ms, GSM322_EVT_PLMN, msg_type, + (uint8_t *)&ngm, sizeof(ngm)); /* forbidden list */ switch (mm->lupd_rej_cause) { @@ -4088,13 +4085,7 @@ static int gsm48_mmr_reg_req(struct osmocom_ms *ms) /* trigger detach of sim card */ static int gsm48_mmr_nreg_req(struct osmocom_ms *ms) { - struct gsm48_mmlayer *mm = &ms->mmlayer; - struct msgb *nmsg; - - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_IMSI_DETACH); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(mm->ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_IMSI_DETACH, NULL, 0); return 0; } @@ -4121,4 +4112,22 @@ static int gsm48_rcv_mmr(struct osmocom_ms *ms, struct msgb *msg) return rc; } +int gsm48_mmevent_input(struct osmocom_ms *ms, int msg_type, + const uint8_t *data, unsigned int len) +{ + struct msgb *nmsg = gsm48_mmevent_msgb_alloc(msg_type); + int rc; + + if (!nmsg) + return -ENOMEM; + if (data && len) { + uint8_t *cur = msgb_push(nmsg, len); + if (!cur) { + msgb_free(nmsg); + return -EIO; + } + memcpy(cur, data, len); + } + return gsm48_mmevent_msg(ms, nmsg); +} diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 177b272..afb53cb 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -1560,7 +1560,6 @@ fail: static int gsm48_new_sysinfo(struct osmocom_ms *ms, uint8_t type) { struct gsm48_sysinfo *s = ms->cellsel.si; - struct msgb *nmsg; struct gsm322_msg em; /* update list of measurements, if BA(SACCH) is complete and new */ @@ -1600,10 +1599,7 @@ static int gsm48_new_sysinfo(struct osmocom_ms *ms, uint8_t type) (uint8_t *)&em, sizeof(em)); /* send timer info to location update process */ - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_SYSINFO); - if (!nmsg) - return -ENOMEM; - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_SYSINFO, NULL, 0); return 0; } diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 3ba78f3..24d7f94 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -855,25 +855,16 @@ int gsm_subscr_generate_kc(struct osmocom_ms *ms, uint8_t key_seq, if ((subscr->sim_type != GSM_SIM_TYPE_READER && subscr->sim_type != GSM_SIM_TYPE_TEST) || !subscr->sim_valid || no_sim) { - struct gsm48_mm_event *nmme; + uint8_t dummy_sres[4] = { 0x12, 0x34, 0x56, 0x78 }; LOGP(DMM, LOGL_INFO, "Sending dummy authentication response\n"); - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_AUTH_RESPONSE); - if (!nmsg) - return -ENOMEM; - nmme = (struct gsm48_mm_event *) nmsg->data; - nmme->sres[0] = 0x12; - nmme->sres[1] = 0x34; - nmme->sres[2] = 0x56; - nmme->sres[3] = 0x78; - gsm48_mmevent_msg(ms, nmsg); - + gsm48_mmevent_input(ms, GSM48_MM_EVENT_AUTH_RESPONSE, + dummy_sres, sizeof(dummy_sres)); return 0; } /* test SIM */ if (subscr->sim_type == GSM_SIM_TYPE_TEST) { - struct gsm48_mm_event *nmme; uint8_t sres[4]; struct gsm_settings *set = &ms->settings; @@ -885,12 +876,8 @@ int gsm_subscr_generate_kc(struct osmocom_ms *ms, uint8_t key_seq, subscr->key_seq = key_seq; LOGP(DMM, LOGL_INFO, "Sending authentication response\n"); - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_AUTH_RESPONSE); - if (!nmsg) - return -ENOMEM; - nmme = (struct gsm48_mm_event *) nmsg->data; - memcpy(nmme->sres, sres, 4); - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_AUTH_RESPONSE, + sres, sizeof(sres)); return 0; } @@ -924,7 +911,6 @@ static void subscr_sim_key_cb(struct osmocom_ms *ms, struct msgb *msg) uint16_t payload_len = msg->len - sizeof(*sh); struct msgb *nmsg; struct sim_hdr *nsh; - struct gsm48_mm_event *nmme; uint8_t *data; /* error handling */ @@ -961,12 +947,7 @@ static void subscr_sim_key_cb(struct osmocom_ms *ms, struct msgb *msg) sim_job(ms, nmsg); /* return signed response */ - nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_AUTH_RESPONSE); - if (!nmsg) - return; - nmme = (struct gsm48_mm_event *) nmsg->data; - memcpy(nmme->sres, payload, 4); - gsm48_mmevent_msg(ms, nmsg); + gsm48_mmevent_input(ms, GSM48_MM_EVENT_AUTH_RESPONSE, payload, 4); msgb_free(msg); } -- 1.7.2.3 --Kj7319i9nmIyA2yE--

14 years, 5 months

[PATCH 2/3] [mobile] replace 3 different gsm322_makesend_* functions with one

by Harald Welte

The new function is gsm322_event_input() and uses the event type as a function argument. --- .../layer23/include/osmocom/bb/mobile/gsm322.h | 12 +++- src/host/layer23/src/mobile/app_mobile.c | 8 ++-- src/host/layer23/src/mobile/gsm322.c | 56 +++++--------------- src/host/layer23/src/mobile/gsm48_mm.c | 34 +++++++----- src/host/layer23/src/mobile/gsm48_rr.c | 9 ++-- src/host/layer23/src/mobile/vty_interface.c | 9 ++-- 6 files changed, 57 insertions(+), 71 deletions(-) diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm322.h b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h index 3cd275f..30d96ee 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm322.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h @@ -32,6 +32,13 @@ #define GSM322_PLMN_SEARCH 10 #define GSM322_HPLMN_SEARCH 11 +/* GSM 03.22 event types */ +enum gsm322_evt_type { + GSM322_EVT_C, /* direct cell event, no queue */ + GSM322_EVT_CS, /* enqueue cs->event_queue */ + GSM322_EVT_PLMN, /* enqueue plmn->event_queue */ +}; + /* GSM 03.22 events */ #define GSM322_EVENT_SWITCH_ON 1 #define GSM322_EVENT_SWITCH_OFF 2 @@ -172,9 +179,8 @@ struct gsm322_msg { int gsm322_init(struct osmocom_ms *ms); int gsm322_exit(struct osmocom_ms *ms); -int gsm322_makesend_plmn_msg(struct osmocom_ms *ms, int msg_type, uint8_t *data, unsigned int len); -int gsm322_makesend_cs_event(struct osmocom_ms *ms, int msg_type, uint8_t *data, unsigned int len); -int gsm322_makesend_c_event(struct osmocom_ms *ms, int msg_type, uint8_t *data, unsigned int len); +int gsm322_event_input(struct osmocom_ms *ms, enum gsm322_evt_type type, + int msg_type, uint8_t *data, unsigned int len); int gsm322_plmn_dequeue(struct osmocom_ms *ms); int gsm322_cs_dequeue(struct osmocom_ms *ms); int gsm322_add_forbidden_la(struct osmocom_ms *ms, uint16_t mcc, diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 3d2100c..b3c3284 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -104,10 +104,10 @@ int mobile_signal_cb(unsigned int subsys, unsigned int signal, break; default: /* no SIM, trigger PLMN selection process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_SWITCH_ON, - NULL, 0); - gsm322_makesend_cs_event(ms, GSM322_EVENT_SWITCH_ON, - NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_SWITCH_ON, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_CS, + GSM322_EVENT_SWITCH_ON, NULL, 0); } ms->started = 1; diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 1429737..3243afc 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -3604,8 +3604,8 @@ int gsm322_exit(struct osmocom_ms *ms) return 0; } -int gsm322_makesend_c_event(struct osmocom_ms *ms, int msg_type, - uint8_t *data, unsigned int len) +int gsm322_event_input(struct osmocom_ms *ms, enum gsm322_evt_type type, + int msg_type, uint8_t *data, unsigned int len) { struct msgb *nmsg = gsm322_msgb_alloc(msg_type); int rc; @@ -3621,46 +3621,18 @@ int gsm322_makesend_c_event(struct osmocom_ms *ms, int msg_type, } memcpy(cur, data, len); } - rc = gsm322_c_event(ms, nmsg); - msgb_free(nmsg); - - return rc; -} - -int gsm322_makesend_cs_event(struct osmocom_ms *ms, int msg_type, - uint8_t *data, unsigned int len) -{ - struct msgb *nmsg = gsm322_msgb_alloc(msg_type); - - if (!nmsg) - return -ENOMEM; - - if (data && len) { - uint8_t *cur = msgb_push(nmsg, len); - if (!cur) { - msgb_free(nmsg); - return -EIO; - } - memcpy(cur, data, len); + switch (type) { + case GSM322_EVT_C: + rc = gsm322_c_event(ms, nmsg); + msgb_free(nmsg); + break; + case GSM322_EVT_CS: + rc = gsm322_cs_sendmsg(ms, nmsg); + break; + case GSM322_EVT_PLMN: + rc = gsm322_plmn_sendmsg(ms, nmsg); + break; } - return gsm322_cs_sendmsg(ms, nmsg); -} - -int gsm322_makesend_plmn_msg(struct osmocom_ms *ms, int msg_type, - uint8_t *data, unsigned int len) -{ - struct msgb *nmsg = gsm322_msgb_alloc(msg_type); - - if (!nmsg) - return -ENOMEM; - if (data && len) { - uint8_t *cur = msgb_push(nmsg, len); - if (!cur) { - msgb_free(nmsg); - return -EIO; - } - memcpy(cur, data, len); - } - return gsm322_plmn_sendmsg(ms, nmsg); + return rc; } diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 58253bd..4652f34 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -1123,8 +1123,8 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) GSM48_MM_SST_NORMAL_SERVICE); /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, - NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_REG_SUCCESS, NULL, 0); return 0; } if (!s->att_allowed) { @@ -1133,8 +1133,8 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) GSM48_MM_SST_NORMAL_SERVICE); /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, - NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_REG_SUCCESS, NULL, 0); return 0; } /* else, continue */ @@ -1150,8 +1150,8 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) GSM48_MM_SST_LIMITED_SERVICE); /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_ROAMING_NA, - NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_ROAMING_NA, NULL, 0); return 0; } @@ -1165,7 +1165,8 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) GSM48_MM_SST_LIMITED_SERVICE); /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_FAILED, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_REG_FAILED, NULL, 0); return 0; } @@ -1733,7 +1734,8 @@ static int gsm48_mm_imsi_detach_end(struct osmocom_ms *ms, struct msgb *msg) } /* send SIM remove event to gsm322 */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_SIM_REMOVE, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_SIM_REMOVE, NULL, 0); /* CS process will trigger return to MM IDLE / No SIM */ return 0; @@ -1993,7 +1995,7 @@ static int gsm48_mm_loc_upd(struct osmocom_ms *ms, struct msgb *msg) _stop: mm->lupd_pending = 0; /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, msg_type, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, msg_type, NULL, 0); return 0; } @@ -2062,7 +2064,8 @@ static int gsm48_mm_loc_upd_normal(struct osmocom_ms *ms, struct msgb *msg) LOGP(DMM, LOGL_INFO, "Loc. upd. not allowed.\n"); /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_FAILED, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_REG_FAILED, NULL, 0); return 0; } @@ -2083,7 +2086,8 @@ static int gsm48_mm_loc_upd_normal(struct osmocom_ms *ms, struct msgb *msg) GSM48_MM_SST_NORMAL_SERVICE); /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_REG_SUCCESS, NULL, 0); return 0; } @@ -2318,7 +2322,8 @@ static int gsm48_mm_rx_loc_upd_acc(struct osmocom_ms *ms, struct msgb *msg) } /* send message to PLMN search process */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_REG_SUCCESS, NULL, 0); /* follow on proceed */ if (TLVP_PRESENT(&tp, GSM48_IE_MOBILE_ID)) @@ -2426,7 +2431,7 @@ static int gsm48_mm_rel_loc_upd_rej(struct osmocom_ms *ms, struct msgb *msg) } memset(&ngm, 0, sizeof(ngm)); ngm.reject = mm->lupd_rej_cause; - gsm322_makesend_plmn_msg(ms, msg_type, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, msg_type, &ngm, sizeof(ngm)); /* forbidden list */ switch (mm->lupd_rej_cause) { @@ -4068,7 +4073,8 @@ static int gsm48_mmr_reg_req(struct osmocom_ms *ms) struct gsm48_mmlayer *mm = &ms->mmlayer; /* schedule insertion of SIM */ - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_SIM_INSERT, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_SIM_INSERT, NULL, 0); /* 4.2.1.2 SIM is inserted in state NO IMSI */ if (mm->state == GSM48_MM_ST_MM_IDLE diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 4a48dc8..177b272 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -408,8 +408,8 @@ static void new_rr_state(struct gsm48_rrlayer *rr, int state) memset(&em, 0, sizeof(em)); em.same_cell = 1; } - gsm322_makesend_c_event(rr->ms, GSM322_EVENT_RET_IDLE, - (uint8_t *)&em, sizeof(em)); + gsm322_event_input(rr->ms, GSM322_EVT_C, GSM322_EVENT_RET_IDLE, + (uint8_t *)&em, sizeof(em)); /* reset any BA range */ rr->ba_ranges = 0; } @@ -1189,7 +1189,8 @@ static int gsm48_rr_chan_req(struct osmocom_ms *ms, int cause, int paging) * NOTE: this must be sent unbuffered, because the state may not * change until idle mode is left */ - rc = gsm322_makesend_c_event(ms, GSM322_EVENT_LEAVE_IDLE, NULL, 0); + rc = gsm322_event_input(ms, GSM322_EVT_C, GSM322_EVENT_LEAVE_IDLE, + NULL, 0); if (rc) { if (paging) return rc; @@ -1595,7 +1596,7 @@ static int gsm48_new_sysinfo(struct osmocom_ms *ms, uint8_t type) /* send sysinfo event to other layers */ memset(&em, 0, sizeof(em)); em.sysinfo = type; - gsm322_makesend_cs_event(ms, GSM322_EVENT_SYSINFO, + gsm322_event_input(ms, GSM322_EVT_CS, GSM322_EVENT_SYSINFO, (uint8_t *)&em, sizeof(em)); /* send timer info to location update process */ diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index e3e7c47..d83dae8 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -689,8 +689,8 @@ DEFUN(network_select, network_select_cmd, "network select MS_NAME MCC MNC", memset(&ngm, 0, sizeof(ngm)); ngm.mcc = mcc; ngm.mnc = mnc; - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_CHOOSE_PLMN, - (uint8_t *)&ngm, sizeof(ngm)); + gsm322_event_input(ms, GSM322_EVT_PLMN, GSM322_EVENT_CHOOSE_PLMN, + (uint8_t *)&ngm, sizeof(ngm)); return CMD_SUCCESS; } @@ -820,7 +820,8 @@ DEFUN(network_search, network_search_cmd, "network search MS_NAME", if (!ms) return CMD_WARNING; - gsm322_makesend_plmn_msg(ms, GSM322_EVENT_USER_RESEL, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, + GSM322_EVENT_USER_RESEL, NULL, 0); return CMD_SUCCESS; } @@ -1265,7 +1266,7 @@ DEFUN(cfg_ms_mode, cfg_ms_mode_cmd, "network-selection-mode (auto|manual)", msg_type = GSM322_EVENT_SEL_MANUAL; if (msg_type < 0) return CMD_WARNING; - gsm322_makesend_plmn_msg(ms, msg_type, NULL, 0); + gsm322_event_input(ms, GSM322_EVT_PLMN, msg_type, NULL, 0); return CMD_SUCCESS; } -- 1.7.2.3 --Kj7319i9nmIyA2yE Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0003-mobile-introduce-and-use-gsm48_mmevevent_input.patch"

14 years, 5 months

[PATCH 1/3] [mobile] simplify code to send events into GSM 3.22 code

by Harald Welte

instead of gsm322_msgb_alloc() followed by a sendmsg with intermittent error checks we now have only a single function call. --- .../layer23/include/osmocom/bb/mobile/gsm322.h | 7 +- src/host/layer23/src/mobile/app_mobile.c | 13 +-- src/host/layer23/src/mobile/gsm322.c | 69 ++++++++++++++- src/host/layer23/src/mobile/gsm48_mm.c | 88 +++++--------------- src/host/layer23/src/mobile/gsm48_rr.c | 33 +++----- src/host/layer23/src/mobile/vty_interface.c | 31 +++---- 6 files changed, 118 insertions(+), 123 deletions(-) diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm322.h b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h index 467ff39..3cd275f 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/gsm322.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h @@ -172,10 +172,9 @@ struct gsm322_msg { int gsm322_init(struct osmocom_ms *ms); int gsm322_exit(struct osmocom_ms *ms); -struct msgb *gsm322_msgb_alloc(int msg_type); -int gsm322_plmn_sendmsg(struct osmocom_ms *ms, struct msgb *msg); -int gsm322_cs_sendmsg(struct osmocom_ms *ms, struct msgb *msg); -int gsm322_c_event(struct osmocom_ms *ms, struct msgb *msg); +int gsm322_makesend_plmn_msg(struct osmocom_ms *ms, int msg_type, uint8_t *data, unsigned int len); +int gsm322_makesend_cs_event(struct osmocom_ms *ms, int msg_type, uint8_t *data, unsigned int len); +int gsm322_makesend_c_event(struct osmocom_ms *ms, int msg_type, uint8_t *data, unsigned int len); int gsm322_plmn_dequeue(struct osmocom_ms *ms); int gsm322_cs_dequeue(struct osmocom_ms *ms); int gsm322_add_forbidden_la(struct osmocom_ms *ms, uint16_t mcc, diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 822ea64..3d2100c 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -79,7 +79,6 @@ int mobile_signal_cb(unsigned int subsys, unsigned int signal, { struct osmocom_ms *ms; struct gsm_settings *set; - struct msgb *nmsg; if (subsys != SS_L1CTL) return 0; @@ -105,14 +104,10 @@ int mobile_signal_cb(unsigned int subsys, unsigned int signal, break; default: /* no SIM, trigger PLMN selection process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_SWITCH_ON); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); - nmsg = gsm322_msgb_alloc(GSM322_EVENT_SWITCH_ON); - if (!nmsg) - return -ENOMEM; - gsm322_cs_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_SWITCH_ON, + NULL, 0); + gsm322_makesend_cs_event(ms, GSM322_EVENT_SWITCH_ON, + NULL, 0); } ms->started = 1; diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 3c920e4..1429737 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -45,6 +45,8 @@ static void gsm322_cs_loss(void *arg); static int gsm322_cs_select(struct osmocom_ms *ms, int any, int plmn_allowed); static int gsm322_m_switch_on(struct osmocom_ms *ms, struct msgb *msg); +static int gsm322_c_event(struct osmocom_ms *ms, struct msgb *msg); + #define SKIP_MAX_PER_BAND #warning HACKING!!! @@ -182,7 +184,7 @@ const char *get_event_name(int value) /* allocate a 03.22 event message */ -struct msgb *gsm322_msgb_alloc(int msg_type) +static struct msgb *gsm322_msgb_alloc(int msg_type) { struct msgb *msg; struct gsm322_msg *gm; @@ -198,7 +200,7 @@ struct msgb *gsm322_msgb_alloc(int msg_type) } /* queue PLMN selection message */ -int gsm322_plmn_sendmsg(struct osmocom_ms *ms, struct msgb *msg) +static int gsm322_plmn_sendmsg(struct osmocom_ms *ms, struct msgb *msg) { struct gsm322_plmn *plmn = &ms->plmn; @@ -208,7 +210,7 @@ int gsm322_plmn_sendmsg(struct osmocom_ms *ms, struct msgb *msg) } /* queue cell selection message */ -int gsm322_cs_sendmsg(struct osmocom_ms *ms, struct msgb *msg) +static int gsm322_cs_sendmsg(struct osmocom_ms *ms, struct msgb *msg) { struct gsm322_cellsel *cs = &ms->cellsel; @@ -3304,7 +3306,7 @@ static struct cellselstatelist { #define CELLSELSLLEN \ (sizeof(cellselstatelist) / sizeof(struct cellselstatelist)) -int gsm322_c_event(struct osmocom_ms *ms, struct msgb *msg) +static int gsm322_c_event(struct osmocom_ms *ms, struct msgb *msg) { struct gsm322_cellsel *cs = &ms->cellsel; struct gsm322_msg *gm = (struct gsm322_msg *) msg->data; @@ -3602,4 +3604,63 @@ int gsm322_exit(struct osmocom_ms *ms) return 0; } +int gsm322_makesend_c_event(struct osmocom_ms *ms, int msg_type, + uint8_t *data, unsigned int len) +{ + struct msgb *nmsg = gsm322_msgb_alloc(msg_type); + int rc; + if (!nmsg) + return -ENOMEM; + + if (data && len) { + uint8_t *cur = msgb_push(nmsg, len); + if (!cur) { + msgb_free(nmsg); + return -EIO; + } + memcpy(cur, data, len); + } + rc = gsm322_c_event(ms, nmsg); + msgb_free(nmsg); + + return rc; +} + +int gsm322_makesend_cs_event(struct osmocom_ms *ms, int msg_type, + uint8_t *data, unsigned int len) +{ + struct msgb *nmsg = gsm322_msgb_alloc(msg_type); + + if (!nmsg) + return -ENOMEM; + + if (data && len) { + uint8_t *cur = msgb_push(nmsg, len); + if (!cur) { + msgb_free(nmsg); + return -EIO; + } + memcpy(cur, data, len); + } + return gsm322_cs_sendmsg(ms, nmsg); +} + +int gsm322_makesend_plmn_msg(struct osmocom_ms *ms, int msg_type, + uint8_t *data, unsigned int len) +{ + struct msgb *nmsg = gsm322_msgb_alloc(msg_type); + + if (!nmsg) + return -ENOMEM; + + if (data && len) { + uint8_t *cur = msgb_push(nmsg, len); + if (!cur) { + msgb_free(nmsg); + return -EIO; + } + memcpy(cur, data, len); + } + return gsm322_plmn_sendmsg(ms, nmsg); +} diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 15bbd27..58253bd 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -1118,33 +1118,23 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) && cs->sel_lac == subscr->lac && !mm->lupd_periodic) { if (subscr->imsi_attached) { - struct msgb *nmsg; - LOGP(DMM, LOGL_INFO, "Valid in location area.\n"); new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_NORMAL_SERVICE); /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_SUCCESS); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); - + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, + NULL, 0); return 0; } if (!s->att_allowed) { - struct msgb *nmsg; - LOGP(DMM, LOGL_INFO, "Attachment not required.\n"); new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_NORMAL_SERVICE); /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_SUCCESS); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); - + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, + NULL, 0); return 0; } /* else, continue */ @@ -1155,17 +1145,13 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) && (gsm_subscr_is_forbidden_plmn(subscr, cs->sel_mcc, cs->sel_mnc) || gsm322_is_forbidden_la(ms, cs->sel_mcc, cs->sel_mnc, cs->sel_lac))) { - struct msgb *nmsg; - LOGP(DMM, LOGL_INFO, "Selected cell is forbidden.\n"); new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_LIMITED_SERVICE); /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_ROAMING_NA); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_ROAMING_NA, + NULL, 0); return 0; } @@ -1174,17 +1160,12 @@ static int gsm48_mm_cell_selected(struct osmocom_ms *ms, struct msgb *msg) if (set->plmn_mode == PLMN_MODE_MANUAL && (plmn->mcc != cs->sel_mcc || plmn->mnc != cs->sel_mnc)) { - struct msgb *nmsg; - LOGP(DMM, LOGL_INFO, "Selected cell not found.\n"); new_mm_state(mm, GSM48_MM_ST_MM_IDLE, GSM48_MM_SST_LIMITED_SERVICE); /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_FAILED); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_FAILED, NULL, 0); return 0; } @@ -1729,7 +1710,6 @@ static int gsm48_mm_imsi_detach_end(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; struct gsm_subscriber *subscr = &ms->subscr; - struct msgb *nmsg; LOGP(DMM, LOGL_INFO, "IMSI has been detached.\n"); @@ -1753,10 +1733,7 @@ static int gsm48_mm_imsi_detach_end(struct osmocom_ms *ms, struct msgb *msg) } /* send SIM remove event to gsm322 */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_SIM_REMOVE); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_SIM_REMOVE, NULL, 0); /* CS process will trigger return to MM IDLE / No SIM */ return 0; @@ -1999,7 +1976,6 @@ static int gsm48_mm_loc_upd(struct osmocom_ms *ms, struct msgb *msg) struct gsm48_sysinfo *s = &cs->sel_si; struct gsm_subscriber *subscr = &ms->subscr; struct gsm_settings *set = &ms->settings; - struct msgb *nmsg; int msg_type; /* (re)start only if we still require location update */ @@ -2017,10 +1993,7 @@ static int gsm48_mm_loc_upd(struct osmocom_ms *ms, struct msgb *msg) _stop: mm->lupd_pending = 0; /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(msg_type); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, msg_type, NULL, 0); return 0; } @@ -2076,7 +2049,6 @@ static int gsm48_mm_loc_upd_normal(struct osmocom_ms *ms, struct msgb *msg) struct gsm_subscriber *subscr = &ms->subscr; struct gsm322_cellsel *cs = &ms->cellsel; struct gsm48_sysinfo *s = &cs->sel_si; - struct msgb *nmsg; /* in case we already have a location update going on */ if (mm->lupd_pending) { @@ -2090,10 +2062,7 @@ static int gsm48_mm_loc_upd_normal(struct osmocom_ms *ms, struct msgb *msg) LOGP(DMM, LOGL_INFO, "Loc. upd. not allowed.\n"); /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_FAILED); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_FAILED, NULL, 0); return 0; } @@ -2114,10 +2083,7 @@ static int gsm48_mm_loc_upd_normal(struct osmocom_ms *ms, struct msgb *msg) GSM48_MM_SST_NORMAL_SERVICE); /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_SUCCESS); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, NULL, 0); return 0; } @@ -2256,7 +2222,6 @@ static int gsm48_mm_rx_loc_upd_acc(struct osmocom_ms *ms, struct msgb *msg) struct gsm48_loc_area_id *lai = (struct gsm48_loc_area_id *) gh->data; unsigned int payload_len = msgb_l3len(msg) - sizeof(*gh); struct tlv_parsed tp; - struct msgb *nmsg; if (payload_len < sizeof(struct gsm48_loc_area_id)) { short_read: @@ -2353,10 +2318,7 @@ static int gsm48_mm_rx_loc_upd_acc(struct osmocom_ms *ms, struct msgb *msg) } /* send message to PLMN search process */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_SUCCESS); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_REG_SUCCESS, NULL, 0); /* follow on proceed */ if (TLVP_PRESENT(&tp, GSM48_IE_MOBILE_ID)) @@ -2408,8 +2370,8 @@ static int gsm48_mm_rel_loc_upd_rej(struct osmocom_ms *ms, struct msgb *msg) { struct gsm48_mmlayer *mm = &ms->mmlayer; struct gsm_subscriber *subscr = &ms->subscr; - struct msgb *nmsg; - struct gsm322_msg *ngm; + struct gsm322_msg ngm; + int msg_type; LOGP(DMM, LOGL_INFO, "Loc. upd. rejected (cause %d)\n", mm->lupd_rej_cause); @@ -2450,23 +2412,21 @@ static int gsm48_mm_rel_loc_upd_rej(struct osmocom_ms *ms, struct msgb *msg) } /* send event to PLMN search process */ - switch(mm->lupd_rej_cause) { + switch (mm->lupd_rej_cause) { case GSM48_REJECT_ROAMING_NOT_ALLOWED: - nmsg = gsm322_msgb_alloc(GSM322_EVENT_ROAMING_NA); + msg_type = GSM322_EVENT_ROAMING_NA; break; case GSM48_REJECT_IMSI_UNKNOWN_IN_HLR: case GSM48_REJECT_ILLEGAL_MS: case GSM48_REJECT_ILLEGAL_ME: - nmsg = gsm322_msgb_alloc(GSM322_EVENT_INVALID_SIM); + msg_type = GSM322_EVENT_INVALID_SIM; break; default: - nmsg = gsm322_msgb_alloc(GSM322_EVENT_REG_FAILED); + msg_type = GSM322_EVENT_REG_FAILED; } - if (!nmsg) - return -ENOMEM; - ngm = (struct gsm322_msg *)nmsg->data; - ngm->reject = mm->lupd_rej_cause; - gsm322_plmn_sendmsg(ms, nmsg); + memset(&ngm, 0, sizeof(ngm)); + ngm.reject = mm->lupd_rej_cause; + gsm322_makesend_plmn_msg(ms, msg_type, NULL, 0); /* forbidden list */ switch (mm->lupd_rej_cause) { @@ -4106,13 +4066,9 @@ static int gsm48_mm_ev(struct osmocom_ms *ms, int msg_type, struct msgb *msg) static int gsm48_mmr_reg_req(struct osmocom_ms *ms) { struct gsm48_mmlayer *mm = &ms->mmlayer; - struct msgb *nmsg; /* schedule insertion of SIM */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_SIM_INSERT); - if (!nmsg) - return -ENOMEM; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_SIM_INSERT, NULL, 0); /* 4.2.1.2 SIM is inserted in state NO IMSI */ if (mm->state == GSM48_MM_ST_MM_IDLE diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index dc2226a..4a48dc8 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -375,8 +375,8 @@ static void new_rr_state(struct gsm48_rrlayer *rr, int state) rr->state = state; if (state == GSM48_RR_ST_IDLE) { - struct msgb *msg, *nmsg; - struct gsm322_msg *em; + struct msgb *msg; + struct gsm322_msg em; /* release dedicated mode, if any */ l1ctl_tx_dm_rel_req(rr->ms); @@ -403,16 +403,13 @@ static void new_rr_state(struct gsm48_rrlayer *rr, int state) * cell selection process returned to camping state * again. (after cell reselection) */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_RET_IDLE); - if (!nmsg) - return; /* return to same cell after LOC.UPD. */ if (rr->est_cause == RR_EST_CAUSE_LOC_UPD) { - em = (struct gsm322_msg *) nmsg->data; - em->same_cell = 1; + memset(&em, 0, sizeof(em)); + em.same_cell = 1; } - gsm322_c_event(rr->ms, nmsg); - msgb_free(nmsg); + gsm322_makesend_c_event(rr->ms, GSM322_EVENT_RET_IDLE, + (uint8_t *)&em, sizeof(em)); /* reset any BA range */ rr->ba_ranges = 0; } @@ -1192,11 +1189,7 @@ static int gsm48_rr_chan_req(struct osmocom_ms *ms, int cause, int paging) * NOTE: this must be sent unbuffered, because the state may not * change until idle mode is left */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_LEAVE_IDLE); - if (!nmsg) - return -ENOMEM; - rc = gsm322_c_event(ms, nmsg); - msgb_free(nmsg); + rc = gsm322_makesend_c_event(ms, GSM322_EVENT_LEAVE_IDLE, NULL, 0); if (rc) { if (paging) return rc; @@ -1567,7 +1560,7 @@ static int gsm48_new_sysinfo(struct osmocom_ms *ms, uint8_t type) { struct gsm48_sysinfo *s = ms->cellsel.si; struct msgb *nmsg; - struct gsm322_msg *em; + struct gsm322_msg em; /* update list of measurements, if BA(SACCH) is complete and new */ if (s @@ -1600,12 +1593,10 @@ static int gsm48_new_sysinfo(struct osmocom_ms *ms, uint8_t type) } /* send sysinfo event to other layers */ - nmsg = gsm322_msgb_alloc(GSM322_EVENT_SYSINFO); - if (!nmsg) - return -ENOMEM; - em = (struct gsm322_msg *) nmsg->data; - em->sysinfo = type; - gsm322_cs_sendmsg(ms, nmsg); + memset(&em, 0, sizeof(em)); + em.sysinfo = type; + gsm322_makesend_cs_event(ms, GSM322_EVENT_SYSINFO, + (uint8_t *)&em, sizeof(em)); /* send timer info to location update process */ nmsg = gsm48_mmevent_msgb_alloc(GSM48_MM_EVENT_SYSINFO); diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 4cc2209..e3e7c47 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -658,8 +658,7 @@ DEFUN(network_select, network_select_cmd, "network select MS_NAME MCC MNC", { struct osmocom_ms *ms; struct gsm322_plmn *plmn; - struct msgb *nmsg; - struct gsm322_msg *ngm; + struct gsm322_msg ngm; struct gsm322_plmn_list *temp; uint16_t mcc = gsm_input_mcc((char *)argv[1]), mnc = gsm_input_mnc((char *)argv[2]); @@ -687,13 +686,11 @@ DEFUN(network_select, network_select_cmd, "network select MS_NAME MCC MNC", return CMD_WARNING; } - nmsg = gsm322_msgb_alloc(GSM322_EVENT_CHOOSE_PLMN); - if (!nmsg) - return CMD_WARNING; - ngm = (struct gsm322_msg *) nmsg->data; - ngm->mcc = mcc; - ngm->mnc = mnc; - gsm322_plmn_sendmsg(ms, nmsg); + memset(&ngm, 0, sizeof(ngm)); + ngm.mcc = mcc; + ngm.mnc = mnc; + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_CHOOSE_PLMN, + (uint8_t *)&ngm, sizeof(ngm)); return CMD_SUCCESS; } @@ -818,16 +815,12 @@ DEFUN(network_search, network_search_cmd, "network search MS_NAME", "Network ...\nTrigger network search\nName of MS (see \"show ms\")") { struct osmocom_ms *ms; - struct msgb *nmsg; ms = get_ms(argv[0], vty); if (!ms) return CMD_WARNING; - nmsg = gsm322_msgb_alloc(GSM322_EVENT_USER_RESEL); - if (!nmsg) - return CMD_WARNING; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, GSM322_EVENT_USER_RESEL, NULL, 0); return CMD_SUCCESS; } @@ -1256,7 +1249,7 @@ DEFUN(cfg_ms_mode, cfg_ms_mode_cmd, "network-selection-mode (auto|manual)", { struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - struct msgb *nmsg; + int msg_type = -1; if (!ms->plmn.state) { if (argv[0][0] == 'a') @@ -1267,12 +1260,12 @@ DEFUN(cfg_ms_mode, cfg_ms_mode_cmd, "network-selection-mode (auto|manual)", return CMD_SUCCESS; } if (argv[0][0] == 'a') - nmsg = gsm322_msgb_alloc(GSM322_EVENT_SEL_AUTO); + msg_type = GSM322_EVENT_SEL_AUTO; else - nmsg = gsm322_msgb_alloc(GSM322_EVENT_SEL_MANUAL); - if (!nmsg) + msg_type = GSM322_EVENT_SEL_MANUAL; + if (msg_type < 0) return CMD_WARNING; - gsm322_plmn_sendmsg(ms, nmsg); + gsm322_makesend_plmn_msg(ms, msg_type, NULL, 0); return CMD_SUCCESS; } -- 1.7.2.3 --Kj7319i9nmIyA2yE Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0002-mobile-replace-3-different-gsm322_makesend_-function.patch"

14 years, 5 months

Channel info

by Bogdan Alecu

Hello, I noticed that when I start the mobile application, after the phone chooses a specific channel I get different messages regarding IMSI saying that it's not for us. What are these messages? Phones that camp on this channel? If so, I tried turning off/on a phone from the same operator but I can't see my IMSI showing up.

14 years, 5 months

Gpio driver for calypso

by Michal Demin

Hello, I have created few patches that aim to add abstraction for gpio handling. First patch adds functions: gpio_config - configure gpio as input/output gpio_read - read state of gpio(s) gpio_write - write/toggle state of gpio(s) gpio_set_handler - enables interrupt on given gpio. Also changes board init files to make them more sane :-) Second patch adds interrupt demuxing and masking into keypad driver as gpio and keypad are handled by the same peripheral. It would make sense to split the keypad driver into calypso-specific and generic stuff once there is support for other chipsets. Also note that interrupt levels in datasheet are active low (p.120), my testing shows otherwise. Michal Demin

14 years, 5 months

doesn't get output from osmocon

by tobsen

Hi, sorry if I shouldn`t write correclly, i`m not that good in english. i have a Motorola c118 and this usb/serial cable: http://www.gsmbase.de/shop/show_product.php?products_id=620 here my problem: compiling was successfully. than i run osmocon: ./osmocon -p /dev/ttyUSB0 -m c123xor /home/test/install/osmocom-bb/src/target/firmware/board/compal_e88/layer1.ramload.bin i pressed power on the phone. nothing happend. again. nothing happend, no output, no upload/download to/from the phone... what is my fault? can you help me? i have tested it with: -m 123 ; -m 118xor ; -m 118 (the same thing) my system is ubuntu 10.10 (not in a virtual box or something else). thanks a lot, tobsen -- View this message in context: http://baseband-devel.722152.n3.nabble.com/doesn-t-get-output-from-osmocon-… Sent from the baseband-devel mailing list archive at Nabble.com.

14 years, 5 months

Documentation for 'mobile' in the wiki

by Harald Welte

Hi guys, I think it is desparately needed that we write more documentation about the 'mobile' program in our wiki. It just occurred to me today that no such page exists so far, and I've created it at http://bb.osmocom.org/trac/wiki/mobile I believe a simple reference of commands is not even all that important (after all, there is 'list' in the telnet interface), but somethnig like common scenarios like * behaving like a normal phone with cell-selection (using real sim) * behaving like a normal phone with cell-selection (using simulated sim) * how to lock to a certain ARFCN/cell * how to manually trigger location area update * how to send/receive sms * how to make mo/mt phone call It would be great if some of the more experienced people would find a couple of minutes to contribute to it. Thanks a lot in advance. Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

14 years, 5 months

Bounce action notification

by mailman＠lists.osmocom.org

This is a Mailman mailing list bounce action notice: List: baseband-devel Member: arslangali(a)inbox.ru Action: Subscription disabled. Reason: Excessive or fatal bounces. The triggering bounce notice is attached below. Questions? Contact the Mailman site administrator at mailman(a)lists.osmocom.org.

14 years, 5 months

Re: Motorola usb cable

by Nikolaus Kohl

>> To make it work you have to recompile the module pl2303, with this >> patch >> (my kernel is 2.6.35.10-74.fc14.i686). Be careful to setup the right >> values in the kernel root Makefile in order to fit your running >> kernel. > > Not necessarily. You should also be able to check without recompiling. > > Just go to the drivers-directory in sysfs: > > cd /sys/bus/usb/drivers/<driver> > which <driver>?I cannot find any pl2303 driver here. (Debian and ubuntu 8.04)> and echo the data to the file new_id (as root): > > echo "067b 0307" > new_id > > This should bind the driver to the new_id. Niko

14 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

baseband-devel January 2011