summaryrefslogtreecommitdiffstats
path: root/openbsc/tests
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2015-04-05 16:55:28 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2015-05-03 21:42:28 +0200
commitc36a6d5705830a6fd6e41e684dc031db35165e04 (patch)
tree9c7483644e7ba6b79acfa91e2873fa5a673498fa /openbsc/tests
parent14b2cd9f321974e211f3291a6ccc2d1aaaf948d1 (diff)
filter: More renaming and remove of "NAT" from it
Diffstat (limited to 'openbsc/tests')
-rw-r--r--openbsc/tests/bsc-nat/bsc_nat_test.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c
index 61b3bd1..2020c7a 100644
--- a/openbsc/tests/bsc-nat/bsc_nat_test.c
+++ b/openbsc/tests/bsc-nat/bsc_nat_test.c
@@ -870,7 +870,7 @@ static void test_cr_filter()
struct bsc_nat_parsed *parsed;
struct bsc_msg_acc_lst *nat_lst, *bsc_lst;
struct bsc_msg_acc_lst_entry *nat_entry, *bsc_entry;
- struct bsc_nat_reject_cause cause;
+ struct bsc_filter_reject_cause cause;
struct bsc_nat *nat = bsc_nat_alloc();
struct bsc_connection *bsc = bsc_connection_alloc(nat);
@@ -947,7 +947,7 @@ static void test_dt_filter()
int i;
struct msgb *msg = msgb_alloc(4096, "test_dt_filter");
struct bsc_nat_parsed *parsed;
- struct bsc_nat_reject_cause cause;
+ struct bsc_filter_reject_cause cause;
struct bsc_nat *nat = bsc_nat_alloc();
struct bsc_connection *bsc = bsc_connection_alloc(nat);
@@ -1454,21 +1454,21 @@ static void test_barr_list_parsing(void)
if (lst == NULL)
abort();
- rc = bsc_nat_barr_adapt(NULL, &root, lst);
+ rc = bsc_filter_barr_adapt(NULL, &root, lst);
if (rc != 0)
abort();
talloc_free(lst);
for (node = rb_first(&root); node; node = rb_next(node)) {
- struct bsc_nat_barr_entry *entry;
- entry = rb_entry(node, struct bsc_nat_barr_entry, node);
+ struct bsc_filter_barr_entry *entry;
+ entry = rb_entry(node, struct bsc_filter_barr_entry, node);
printf("IMSI: %s CM: %d LU: %d\n", entry->imsi,
entry->cm_reject_cause, entry->lu_reject_cause);
}
/* do the look up now.. */
- rc = bsc_nat_barr_find(&root, "12123119", &cm, &lu);
+ rc = bsc_filter_barr_find(&root, "12123119", &cm, &lu);
if (!rc) {
printf("Failed to find the IMSI.\n");
abort();
@@ -1480,7 +1480,7 @@ static void test_barr_list_parsing(void)
}
/* empty and check that it is empty */
- bsc_nat_barr_adapt(NULL, &root, NULL);
+ bsc_filter_barr_adapt(NULL, &root, NULL);
if (!RB_EMPTY_ROOT(&root)) {
printf("Failed to empty the list.\n");
abort();
@@ -1493,7 +1493,7 @@ static void test_barr_list_parsing(void)
abort();
}
- rc = bsc_nat_barr_adapt(NULL, &root, lst);
+ rc = bsc_filter_barr_adapt(NULL, &root, lst);
if (rc != -1) {
printf("It should have failed due dup\n");
abort();
@@ -1502,13 +1502,13 @@ static void test_barr_list_parsing(void)
/* dump for reference */
for (node = rb_first(&root); node; node = rb_next(node)) {
- struct bsc_nat_barr_entry *entry;
- entry = rb_entry(node, struct bsc_nat_barr_entry, node);
+ struct bsc_filter_barr_entry *entry;
+ entry = rb_entry(node, struct bsc_filter_barr_entry, node);
printf("IMSI: %s CM: %d LU: %d\n", entry->imsi,
entry->cm_reject_cause, entry->lu_reject_cause);
}
- rc = bsc_nat_barr_adapt(NULL, &root, NULL);
+ rc = bsc_filter_barr_adapt(NULL, &root, NULL);
}
static void test_nat_extract_lac()