diff options
Diffstat (limited to 'openbsc/src/libfilter')
| -rw-r--r-- | openbsc/src/libfilter/bsc_msg_acc.c | 24 | ||||
| -rw-r--r-- | openbsc/src/libfilter/bsc_msg_filter.c | 14 | ||||
| -rw-r--r-- | openbsc/src/libfilter/bsc_msg_vty.c | 32 |
3 files changed, 35 insertions, 35 deletions
diff --git a/openbsc/src/libfilter/bsc_msg_acc.c b/openbsc/src/libfilter/bsc_msg_acc.c index cc6c44405..d2f45b36f 100644 --- a/openbsc/src/libfilter/bsc_msg_acc.c +++ b/openbsc/src/libfilter/bsc_msg_acc.c @@ -38,9 +38,9 @@ static const struct rate_ctr_group_desc bsc_cfg_acc_list_desc = { }; -int bsc_nat_lst_check_allow(struct bsc_nat_acc_lst *lst, const char *mi_string) +int bsc_msg_acc_lst_check_allow(struct bsc_msg_acc_lst *lst, const char *mi_string) { - struct bsc_nat_acc_lst_entry *entry; + struct bsc_msg_acc_lst_entry *entry; llist_for_each_entry(entry, &lst->fltr_list, list) { if (!entry->imsi_allow) @@ -52,9 +52,9 @@ int bsc_nat_lst_check_allow(struct bsc_nat_acc_lst *lst, const char *mi_string) return 1; } -struct bsc_nat_acc_lst *bsc_nat_acc_lst_find(struct llist_head *head, const char *name) +struct bsc_msg_acc_lst *bsc_msg_acc_lst_find(struct llist_head *head, const char *name) { - struct bsc_nat_acc_lst *lst; + struct bsc_msg_acc_lst *lst; if (!name) return NULL; @@ -66,15 +66,15 @@ struct bsc_nat_acc_lst *bsc_nat_acc_lst_find(struct llist_head *head, const char return NULL; } -struct bsc_nat_acc_lst *bsc_nat_acc_lst_get(void *ctx, struct llist_head *head, const char *name) +struct bsc_msg_acc_lst *bsc_msg_acc_lst_get(void *ctx, struct llist_head *head, const char *name) { - struct bsc_nat_acc_lst *lst; + struct bsc_msg_acc_lst *lst; - lst = bsc_nat_acc_lst_find(head, name); + lst = bsc_msg_acc_lst_find(head, name); if (lst) return lst; - lst = talloc_zero(ctx, struct bsc_nat_acc_lst); + lst = talloc_zero(ctx, struct bsc_msg_acc_lst); if (!lst) { LOGP(DNAT, LOGL_ERROR, "Failed to allocate access list"); return NULL; @@ -93,18 +93,18 @@ struct bsc_nat_acc_lst *bsc_nat_acc_lst_get(void *ctx, struct llist_head *head, return lst; } -void bsc_nat_acc_lst_delete(struct bsc_nat_acc_lst *lst) +void bsc_msg_acc_lst_delete(struct bsc_msg_acc_lst *lst) { llist_del(&lst->list); rate_ctr_group_free(lst->stats); talloc_free(lst); } -struct bsc_nat_acc_lst_entry *bsc_nat_acc_lst_entry_create(struct bsc_nat_acc_lst *lst) +struct bsc_msg_acc_lst_entry *bsc_msg_acc_lst_entry_create(struct bsc_msg_acc_lst *lst) { - struct bsc_nat_acc_lst_entry *entry; + struct bsc_msg_acc_lst_entry *entry; - entry = talloc_zero(lst, struct bsc_nat_acc_lst_entry); + entry = talloc_zero(lst, struct bsc_msg_acc_lst_entry); if (!entry) return NULL; diff --git a/openbsc/src/libfilter/bsc_msg_filter.c b/openbsc/src/libfilter/bsc_msg_filter.c index 1f7a14e63..19367a013 100644 --- a/openbsc/src/libfilter/bsc_msg_filter.c +++ b/openbsc/src/libfilter/bsc_msg_filter.c @@ -123,10 +123,10 @@ int bsc_nat_barr_adapt(void *ctx, struct rb_root *root, } -static int lst_check_deny(struct bsc_nat_acc_lst *lst, const char *mi_string, +static int lst_check_deny(struct bsc_msg_acc_lst *lst, const char *mi_string, int *cm_cause, int *lu_cause) { - struct bsc_nat_acc_lst_entry *entry; + struct bsc_msg_acc_lst_entry *entry; llist_for_each_entry(entry, &lst->fltr_list, list) { if (!entry->imsi_deny) @@ -154,8 +154,8 @@ static int auth_imsi(struct bsc_connection *bsc, const char *imsi, * 5.) Allow directly if the IMSI is allowed at the global level */ int cm, lu; - struct bsc_nat_acc_lst *nat_lst = NULL; - struct bsc_nat_acc_lst *bsc_lst = NULL; + struct bsc_msg_acc_lst *nat_lst = NULL; + struct bsc_msg_acc_lst *bsc_lst = NULL; /* 1. global check for barred imsis */ if (bsc_nat_barr_find(&bsc->nat->imsi_black_list, imsi, &cm, &lu)) { @@ -168,13 +168,13 @@ static int auth_imsi(struct bsc_connection *bsc, const char *imsi, } - bsc_lst = bsc_nat_acc_lst_find(&bsc->nat->access_lists, bsc->cfg->acc_lst_name); - nat_lst = bsc_nat_acc_lst_find(&bsc->nat->access_lists, bsc->nat->acc_lst_name); + bsc_lst = bsc_msg_acc_lst_find(&bsc->nat->access_lists, bsc->cfg->acc_lst_name); + nat_lst = bsc_msg_acc_lst_find(&bsc->nat->access_lists, bsc->nat->acc_lst_name); if (bsc_lst) { /* 2. BSC allow */ - if (bsc_nat_lst_check_allow(bsc_lst, imsi) == 0) + if (bsc_msg_acc_lst_check_allow(bsc_lst, imsi) == 0) return 1; /* 3. BSC deny */ diff --git a/openbsc/src/libfilter/bsc_msg_vty.c b/openbsc/src/libfilter/bsc_msg_vty.c index 79cf03db1..c342fdca0 100644 --- a/openbsc/src/libfilter/bsc_msg_vty.c +++ b/openbsc/src/libfilter/bsc_msg_vty.c @@ -32,12 +32,12 @@ DEFUN(cfg_lst_no, NO_STR "Remove an access-list by name\n" "The access-list to remove\n") { - struct bsc_nat_acc_lst *acc; - acc = bsc_nat_acc_lst_find(_acc_lst, argv[0]); + struct bsc_msg_acc_lst *acc; + acc = bsc_msg_acc_lst_find(_acc_lst, argv[0]); if (!acc) return CMD_WARNING; - bsc_nat_acc_lst_delete(acc); + bsc_msg_acc_lst_delete(acc); return CMD_SUCCESS; } @@ -46,8 +46,8 @@ DEFUN(show_acc_lst, "show access-list NAME", SHOW_STR "IMSI access list\n" "Name of the access list\n") { - struct bsc_nat_acc_lst *acc; - acc = bsc_nat_acc_lst_find(_acc_lst, argv[0]); + struct bsc_msg_acc_lst *acc; + acc = bsc_msg_acc_lst_find(_acc_lst, argv[0]); if (!acc) return CMD_WARNING; @@ -65,14 +65,14 @@ DEFUN(cfg_lst_imsi_allow, "Add allowed IMSI to the list\n" "Regexp for IMSIs\n") { - struct bsc_nat_acc_lst *acc; - struct bsc_nat_acc_lst_entry *entry; + struct bsc_msg_acc_lst *acc; + struct bsc_msg_acc_lst_entry *entry; - acc = bsc_nat_acc_lst_get(_ctx, _acc_lst, argv[0]); + acc = bsc_msg_acc_lst_get(_ctx, _acc_lst, argv[0]); if (!acc) return CMD_WARNING; - entry = bsc_nat_acc_lst_entry_create(acc); + entry = bsc_msg_acc_lst_entry_create(acc); if (!entry) return CMD_WARNING; @@ -91,14 +91,14 @@ DEFUN(cfg_lst_imsi_deny, "CM Service Reject reason\n" "LU Reject reason\n") { - struct bsc_nat_acc_lst *acc; - struct bsc_nat_acc_lst_entry *entry; + struct bsc_msg_acc_lst *acc; + struct bsc_msg_acc_lst_entry *entry; - acc = bsc_nat_acc_lst_get(_ctx, _acc_lst, argv[0]); + acc = bsc_msg_acc_lst_get(_ctx, _acc_lst, argv[0]); if (!acc) return CMD_WARNING; - entry = bsc_nat_acc_lst_entry_create(acc); + entry = bsc_msg_acc_lst_entry_create(acc); if (!entry) return CMD_WARNING; @@ -111,9 +111,9 @@ DEFUN(cfg_lst_imsi_deny, return CMD_SUCCESS; } -void bsc_nat_acc_lst_write(struct vty *vty, struct bsc_nat_acc_lst *lst) +void bsc_msg_acc_lst_write(struct vty *vty, struct bsc_msg_acc_lst *lst) { - struct bsc_nat_acc_lst_entry *entry; + struct bsc_msg_acc_lst_entry *entry; llist_for_each_entry(entry, &lst->fltr_list, list) { if (entry->imsi_allow) @@ -127,7 +127,7 @@ void bsc_nat_acc_lst_write(struct vty *vty, struct bsc_nat_acc_lst *lst) } } -void bsc_nat_lst_vty_init(void *ctx, struct llist_head *lst, int node) +void bsc_msg_lst_vty_init(void *ctx, struct llist_head *lst, int node) { _ctx = ctx; _acc_lst = lst; |