[layer23] Added special return value for invalid MCC/MNC input

[osmocom-bb.git] / src / host / layer23 / src / mobile / vty_interface.c

diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c
index 7860e31..5fe3441 100644 (file)
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -391,11 +391,11 @@ DEFUN(show_ba, show_ba_cmd, "show ba MS_NAME [MCC] [MNC]",
        if (argc >= 3) {
                mcc = gsm_input_mcc((char *)argv[1]);
                mnc = gsm_input_mnc((char *)argv[2]);
-               if (!mcc) {
+               if (mcc == GSM_INPUT_INVALID) {
                        vty_out(vty, "Given MCC invalid%s", VTY_NEWLINE);
                        return CMD_WARNING;
                }
-               if (!mnc) {
+               if (mnc == GSM_INPUT_INVALID) {
                        vty_out(vty, "Given MNC invalid%s", VTY_NEWLINE);
                        return CMD_WARNING;
                }
@@ -487,11 +487,11 @@ DEFUN(sim_test, sim_test_cmd, "sim testcard MS_NAME [MCC] [MNC] [LAC] [TMSI]",
        if (argc >= 3) {
                mcc = gsm_input_mcc((char *)argv[1]);
                mnc = gsm_input_mnc((char *)argv[2]);
-               if (!mcc) {
+               if (mcc == GSM_INPUT_INVALID) {
                        vty_out(vty, "Given MCC invalid%s", VTY_NEWLINE);
                        return CMD_WARNING;
                }
-               if (!mnc) {
+               if (mnc == GSM_INPUT_INVALID) {
                        vty_out(vty, "Given MNC invalid%s", VTY_NEWLINE);
                        return CMD_WARNING;
                }
@@ -674,11 +674,11 @@ DEFUN(sim_lai, sim_lai_cmd, "sim lai MS_NAME MCC MNC LAC",
        if (!ms)
                return CMD_WARNING;
 
-       if (!mcc) {
+       if (mcc == GSM_INPUT_INVALID) {
                vty_out(vty, "Given MCC invalid%s", VTY_NEWLINE);
                return CMD_WARNING;
        }
-       if (!mnc) {
+       if (mnc == GSM_INPUT_INVALID) {
                vty_out(vty, "Given MNC invalid%s", VTY_NEWLINE);
                return CMD_WARNING;
        }
@@ -719,11 +719,11 @@ DEFUN(network_select, network_select_cmd,
                return CMD_WARNING;
        }
 
-       if (!mcc) {
+       if (mcc == GSM_INPUT_INVALID) {
                vty_out(vty, "Given MCC invalid%s", VTY_NEWLINE);
                return CMD_WARNING;
        }
-       if (!mnc) {
+       if (mnc == GSM_INPUT_INVALID) {
                vty_out(vty, "Given MNC invalid%s", VTY_NEWLINE);
                return CMD_WARNING;
        }
@@ -877,11 +877,11 @@ DEFUN(delete_forbidden_plmn, delete_forbidden_plmn_cmd,
        if (!ms)
                return CMD_WARNING;
 
-       if (!mcc) {
+       if (mcc == GSM_INPUT_INVALID) {
                vty_out(vty, "Given MCC invalid%s", VTY_NEWLINE);
                return CMD_WARNING;
        }
-       if (!mnc) {
+       if (mnc == GSM_INPUT_INVALID) {
                vty_out(vty, "Given MNC invalid%s", VTY_NEWLINE);
                return CMD_WARNING;
        }
@@ -2044,7 +2044,7 @@ SUP_DI(cfg_ms_sup_no_a5_5, cfg_ms_sup_no_a5_5_cmd, a5_5, "a5/5", "A5/5", 0);
 SUP_EN(cfg_ms_sup_a5_6, cfg_ms_sup_a5_6_cmd, a5_6, "a5/6", "A5/6", 0);
 SUP_DI(cfg_ms_sup_no_a5_6, cfg_ms_sup_no_a5_6_cmd, a5_6, "a5/6", "A5/6", 0);
 SUP_EN(cfg_ms_sup_a5_7, cfg_ms_sup_a5_7_cmd, a5_7, "a5/7", "A5/7", 0);
-SUP_DI(cfg_ms_sup_no_a5_7, cfg_ms_sup_no_a5_7_cmd, a5_7, "a5/7", "A5/7", 1);
+SUP_DI(cfg_ms_sup_no_a5_7, cfg_ms_sup_no_a5_7_cmd, a5_7, "a5/7", "A5/7", 0);
 SUP_EN(cfg_ms_sup_p_gsm, cfg_ms_sup_p_gsm_cmd, p_gsm, "p-gsm", "P-GSM (900)",
        1);
 SUP_DI(cfg_ms_sup_no_p_gsm, cfg_ms_sup_no_p_gsm_cmd, p_gsm, "p-gsm",
@@ -2057,22 +2057,22 @@ SUP_EN(cfg_ms_sup_r_gsm, cfg_ms_sup_r_gsm_cmd, r_gsm, "r-gsm", "R-GSM (850)",
        1);
 SUP_DI(cfg_ms_sup_no_r_gsm, cfg_ms_sup_no_r_gsm_cmd, r_gsm, "r-gsm",
        "R-GSM (850)", 1);
-SUP_EN(cfg_ms_sup_dcs, cfg_ms_sup_dcs_cmd, dcs, "dcs", "DCS (1800)", 0);
-SUP_DI(cfg_ms_sup_no_dcs, cfg_ms_sup_no_dcs_cmd, dcs, "dcs", "DCS (1800)", 0);
+SUP_EN(cfg_ms_sup_dcs, cfg_ms_sup_dcs_cmd, dcs, "dcs", "DCS (1800)", 1);
+SUP_DI(cfg_ms_sup_no_dcs, cfg_ms_sup_no_dcs_cmd, dcs, "dcs", "DCS (1800)", 1);
 SUP_EN(cfg_ms_sup_gsm_850, cfg_ms_sup_gsm_850_cmd, gsm_850, "gsm-850",
-       "GSM 850", 0);
+       "GSM 850", 1);
 SUP_DI(cfg_ms_sup_no_gsm_850, cfg_ms_sup_no_gsm_850_cmd, gsm_850, "gsm-850",
-       "GSM 850", 0);
-SUP_EN(cfg_ms_sup_pcs, cfg_ms_sup_pcs_cmd, pcs, "pcs", "PCS (1900)", 0);
-SUP_DI(cfg_ms_sup_no_pcs, cfg_ms_sup_no_pcs_cmd, pcs, "pcs", "PCS (1900)", 0);
+       "GSM 850", 1);
+SUP_EN(cfg_ms_sup_pcs, cfg_ms_sup_pcs_cmd, pcs, "pcs", "PCS (1900)", 1);
+SUP_DI(cfg_ms_sup_no_pcs, cfg_ms_sup_no_pcs_cmd, pcs, "pcs", "PCS (1900)", 1);
 SUP_EN(cfg_ms_sup_gsm_480, cfg_ms_sup_gsm_480_cmd, gsm_480, "gsm-480",
-       "GSM 480", 0);
+       "GSM 480", 1);
 SUP_DI(cfg_ms_sup_no_gsm_480, cfg_ms_sup_no_gsm_480_cmd, gsm_480, "gsm-480",
-       "GSM 480", 0);
+       "GSM 480", 1);
 SUP_EN(cfg_ms_sup_gsm_450, cfg_ms_sup_gsm_450_cmd, gsm_450, "gsm-450",
-       "GSM 450", 0);
+       "GSM 450", 1);
 SUP_DI(cfg_ms_sup_no_gsm_450, cfg_ms_sup_no_gsm_450_cmd, gsm_450, "gsm-450",
-       "GSM 450", 0);
+       "GSM 450", 1);
 
 DEFUN(cfg_ms_sup_class_900, cfg_ms_sup_class_900_cmd, "class-900 (1|2|3|4|5)",
        "Select power class for GSM 900\n"
@@ -2410,11 +2410,11 @@ DEFUN(cfg_test_rplmn, cfg_test_rplmn_cmd, "rplmn MCC MNC [LAC] [TMSI]",
        uint16_t mcc = gsm_input_mcc((char *)argv[0]),
                 mnc = gsm_input_mnc((char *)argv[1]);
 
-       if (!mcc) {
+       if (mcc == GSM_INPUT_INVALID) {
                vty_out(vty, "Given MCC invalid%s", VTY_NEWLINE);
                return CMD_WARNING;
        }
-       if (!mnc) {
+       if (mnc == GSM_INPUT_INVALID) {
                vty_out(vty, "Given MNC invalid%s", VTY_NEWLINE);
                return CMD_WARNING;
        }