layer23 manual network search: Fixed searching behavior.

First of all I cleaned up the VTY commands. Instead of something like
"barred-access (yes|no)", I use now "barred-access" and "no barred-access".
Your stored configuration file will not load, because config format has
changed. Just remove the lines that cannot be parsed by VTY from your
config. Then the default values are used on next startup. Modify these as
desired via VTY using the new commands.

Use "rplmn <mcc> <mnc>" or "no rplmn" to set the initial behaviour of
network search. If RPLMN is set, this network is selected. If it is not
found, it will be displayed, then it is time to do a search
"network search 1".

If you have set "no rplmn" the search is started automatically on power on.
After the search you can see available networks and show the cells using
"show cell 1" or the detailed information "show cell 1 <arfcn>".

For testing all that be sure to set the "sim" to "test" and the
"network-search" to "manual". Do "show run" to see all commands to be set.

diff --git a/src/host/layer23/src/gsm322.c b/src/host/layer23/src/gsm322.c
index 3bc166a..c2e36f8 100644 (file)
--- a/src/host/layer23/src/gsm322.c
+++ b/src/host/layer23/src/gsm322.c
@@ -1147,19 +1147,11 @@ static int gsm322_a_sel_manual(struct osmocom_ms *ms, struct msgb *msg)
  * handler for manual search
  */
 
-/* go Not on PLMN state */
-static int gsm322_m_go_not_on_plmn(struct osmocom_ms *ms, struct msgb *msg)
-{
-       struct gsm322_plmn *plmn = &ms->plmn;
-
-       new_m_state(plmn, GSM322_M3_NOT_ON_PLMN);
-
-       return 0;
-}
-
 /* display PLMNs and to Not on PLMN */
 static int gsm322_m_display_plmns(struct osmocom_ms *ms, struct msgb *msg)
 {
+       struct gsm322_msg *gm = (struct gsm322_msg *) msg->data;
+       int msg_type = gm->msg_type;
        struct gsm322_plmn *plmn = &ms->plmn;
        struct gsm_sub_plmn_list *temp;
 
@@ -1167,15 +1159,41 @@ static int gsm322_m_display_plmns(struct osmocom_ms *ms, struct msgb *msg)
        gsm322_sort_list(ms);
 
        vty_notify(ms, NULL);
-       vty_notify(ms, "Select from Network:\n");
+       switch (msg_type) {
+       case GSM322_EVENT_REG_FAILED:
+               vty_notify(ms, "Failed to register to network %03d, %02d "
+                       "(%s, %s)\n",
+                       plmn->mcc, plmn->mnc, gsm_get_mcc(plmn->mcc),
+                       gsm_get_mnc(plmn->mcc, plmn->mnc));
+               break;
+       case GSM322_EVENT_NO_CELL_FOUND:
+               vty_notify(ms, "No cell found for network %03d, %02d "
+                       "(%s, %s)\n",
+                       plmn->mcc, plmn->mnc, gsm_get_mcc(plmn->mcc),
+                       gsm_get_mnc(plmn->mcc, plmn->mnc));
+               break;
+       case GSM322_EVENT_ROAMING_NA:
+               vty_notify(ms, "Roaming not allowed to network %03d, %02d "
+                       "(%s, %s)\n",
+                       plmn->mcc, plmn->mnc, gsm_get_mcc(plmn->mcc),
+                       gsm_get_mnc(plmn->mcc, plmn->mnc));
+               break;
+       }
 
-       llist_for_each_entry(temp, &plmn->sorted_plmn, entry)
-               vty_notify(ms, " Network %03d, %02d (%s, %s)\n", temp->mcc,
-                       temp->mnc, gsm_get_mcc(temp->mcc),
-                       gsm_get_mnc(temp->mcc, temp->mnc));
+       if (llist_empty(&plmn->sorted_plmn))
+               vty_notify(ms, "Search network!\n");
+       else {
+               vty_notify(ms, "Search or select from network:\n");
+               llist_for_each_entry(temp, &plmn->sorted_plmn, entry)
+                       vty_notify(ms, " Network %03d, %02d (%s, %s)\n",
+                               temp->mcc, temp->mnc, gsm_get_mcc(temp->mcc),
+                               gsm_get_mnc(temp->mcc, temp->mnc));
+       }
        
        /* go Not on PLMN state */
-       return gsm322_m_go_not_on_plmn(ms, msg);
+       new_m_state(plmn, GSM322_M3_NOT_ON_PLMN);
+
+       return 0;
 }
 
 /* user starts reselection */
@@ -1851,7 +1869,7 @@ static int gsm322_cs_store(struct osmocom_ms *ms)
        case PLMN_MODE_AUTO:
                if (plmn->state == GSM322_A4_WAIT_FOR_PLMN) {
                        /* PLMN becomes available */
-                       nmsg = gsm322_msgb_alloc( GSM322_EVENT_PLMN_AVAIL);
+                       nmsg = gsm322_msgb_alloc(GSM322_EVENT_PLMN_AVAIL);
                        if (!nmsg)
                                return -ENOMEM;
                        gsm322_plmn_sendmsg(ms, nmsg);
@@ -1862,7 +1880,7 @@ static int gsm322_cs_store(struct osmocom_ms *ms)
                  && gsm322_is_plmn_avail(cs, plmn->mcc,
                        plmn->mnc)) {
                        /* PLMN becomes available */
-                       nmsg = gsm322_msgb_alloc( GSM322_EVENT_PLMN_AVAIL);
+                       nmsg = gsm322_msgb_alloc(GSM322_EVENT_PLMN_AVAIL);
                        if (!nmsg)
                                return -ENOMEM;
                        gsm322_plmn_sendmsg(ms, nmsg);
@@ -3007,13 +3025,13 @@ static struct plmnmstatelist {
         GSM322_EVENT_REG_SUCCESS, gsm322_m_go_on_plmn},
 
        {SBIT(GSM322_M4_TRYING_PLMN),
-        GSM322_EVENT_REG_FAILED, gsm322_m_go_not_on_plmn},
+        GSM322_EVENT_REG_FAILED, gsm322_m_display_plmns},
 
        {SBIT(GSM322_M4_TRYING_PLMN),
-        GSM322_EVENT_ROAMING_NA, gsm322_m_go_not_on_plmn},
+        GSM322_EVENT_ROAMING_NA, gsm322_m_display_plmns},
 
        {SBIT(GSM322_M4_TRYING_PLMN),
-        GSM322_EVENT_NO_CELL_FOUND, gsm322_m_go_not_on_plmn},
+        GSM322_EVENT_NO_CELL_FOUND, gsm322_m_display_plmns},
 
        {ALL_STATES,
         GSM322_EVENT_SEL_AUTO, gsm322_m_sel_auto},

diff --git a/src/host/layer23/src/vty_interface.c b/src/host/layer23/src/vty_interface.c
index 5d43e97..768ff92 100644 (file)
--- a/src/host/layer23/src/vty_interface.c
+++ b/src/host/layer23/src/vty_interface.c
@@ -497,14 +497,13 @@ static void config_write_ms_single(struct vty *vty, struct osmocom_ms *ms)
                ms->settings.emergency_imsi : "none", VTY_NEWLINE);
        vty_out(vty, " test-sim%s", VTY_NEWLINE);
        vty_out(vty, "  imsi %s%s", ms->settings.test_imsi, VTY_NEWLINE);
-       vty_out(vty, "  barred-access %s%s", (set->test_barr) ? "yes" : "no",
+       vty_out(vty, "  %sbarred-access%s", (set->test_barr) ? "" : "no ",
                VTY_NEWLINE);
        if (ms->settings.test_rplmn_valid)
-               vty_out(vty, "  rplmn-valid%s", VTY_NEWLINE);
+               vty_out(vty, "  rplmn %03d %02d%s", ms->settings.test_rplmn_mcc,
+                       ms->settings.test_rplmn_mnc, VTY_NEWLINE);
        else
-               vty_out(vty, "  rplmn-invalid%s", VTY_NEWLINE);
-       vty_out(vty, "  rplmn %03d %02d%s", ms->settings.test_rplmn_mcc,
-               ms->settings.test_rplmn_mnc, VTY_NEWLINE);
+               vty_out(vty, "  no rplmn%s", VTY_NEWLINE);
        vty_out(vty, "  hplmn-search %s%s", (set->test_always) ? "everywhere"
                        : "foreign-country", VTY_NEWLINE);
        vty_out(vty, " exit%s", VTY_NEWLINE);
@@ -667,35 +666,28 @@ DEFUN(cfg_test_imsi, cfg_test_imsi_cmd, "imsi IMSI",
        return CMD_SUCCESS;
 }
 
-DEFUN(cfg_test_barr, cfg_test_barr_cmd, "barred-access (yes|no)",
-       "Allow access to barred cells\nAccess allowed\nAccess denied")
+DEFUN(cfg_test_barr, cfg_test_barr_cmd, "barred-access",
+       "Allow access to barred cells")
 {
        struct osmocom_ms *ms = vty->index;
 
-       switch (argv[0][0]) {
-       case 'y':
-               ms->settings.test_barr = 1;
-               break;
-       case 'n':
-               ms->settings.test_barr = 0;
-               break;
-       }
+       ms->settings.test_barr = 1;
 
        return CMD_SUCCESS;
 }
 
-DEFUN(cfg_test_rplmn_valid, cfg_test_rplmn_valid_cmd, "rplmn-valid",
-       "Mark Registered PLMN as valid")
+DEFUN(cfg_test_no_barr, cfg_test_no_barr_cmd, "no barred-access",
+       NO_STR "Deny access to barred cells")
 {
        struct osmocom_ms *ms = vty->index;
 
-       ms->settings.test_rplmn_valid = 1;
+       ms->settings.test_barr = 0;
 
        return CMD_SUCCESS;
 }
 
-DEFUN(cfg_test_rplmn_invalid, cfg_test_rplmn_invalid_cmd, "rplmn-invalid",
-       "Mark Registered PLMN as invalid")
+DEFUN(cfg_test_no_rplmn, cfg_test_no_rplmn_cmd, "no rplmn",
+       NO_STR "Unset Registered PLMN")
 {
        struct osmocom_ms *ms = vty->index;
 
@@ -709,6 +701,7 @@ DEFUN(cfg_test_rplmn, cfg_test_rplmn_cmd, "rplmn MCC MNC",
 {
        struct osmocom_ms *ms = vty->index;
 
+       ms->settings.test_rplmn_valid = 1;
        ms->settings.test_rplmn_mcc = atoi(argv[0]);
        ms->settings.test_rplmn_mnc = atoi(argv[1]);
 
@@ -780,8 +773,8 @@ int ms_vty_init(void)
        install_default(TESTSIM_NODE);
        install_element(TESTSIM_NODE, &cfg_test_imsi_cmd);
        install_element(TESTSIM_NODE, &cfg_test_barr_cmd);
-       install_element(TESTSIM_NODE, &cfg_test_rplmn_valid_cmd);
-       install_element(TESTSIM_NODE, &cfg_test_rplmn_invalid_cmd);
+       install_element(TESTSIM_NODE, &cfg_test_no_barr_cmd);
+       install_element(TESTSIM_NODE, &cfg_test_no_rplmn_cmd);
        install_element(TESTSIM_NODE, &cfg_test_rplmn_cmd);
        install_element(TESTSIM_NODE, &cfg_test_hplmn_cmd);