summaryrefslogtreecommitdiffstats
path: root/openbsc/tests
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2015-04-05 21:03:49 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2015-05-03 22:09:02 +0200
commitc652913674ecc30f8d234878a17baa623cbacf99 (patch)
tree09897c3d57db4568552461c824ad5696b5e7f704 /openbsc/tests
parent06a88fa0ae1f86cef0a23a1462bfef950418ea36 (diff)
filter: Move the con_type into the filter_state
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 e883ddd..b830eb0 100644
--- a/openbsc/tests/bsc-nat/bsc_nat_test.c
+++ b/openbsc/tests/bsc-nat/bsc_nat_test.c
@@ -711,7 +711,7 @@ static struct cr_filter cr_filter[] = {
.data = bssmap_cr,
.length = sizeof(bssmap_cr),
.result = 1,
- .contype = NAT_CON_TYPE_CM_SERV_REQ,
+ .contype = FLT_CON_TYPE_CM_SERV_REQ,
.nat_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.nat_lu_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.bsc_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
@@ -723,7 +723,7 @@ static struct cr_filter cr_filter[] = {
.data = bss_lu,
.length = sizeof(bss_lu),
.result = 1,
- .contype = NAT_CON_TYPE_LU,
+ .contype = FLT_CON_TYPE_LU,
.nat_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.nat_lu_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.bsc_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
@@ -735,7 +735,7 @@ static struct cr_filter cr_filter[] = {
.data = pag_resp,
.length = sizeof(pag_resp),
.result = 1,
- .contype = NAT_CON_TYPE_PAG_RESP,
+ .contype = FLT_CON_TYPE_PAG_RESP,
.nat_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.nat_lu_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.bsc_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
@@ -749,7 +749,7 @@ static struct cr_filter cr_filter[] = {
.length = sizeof(bss_lu),
.result = -3,
.nat_imsi_deny = "[0-9]*",
- .contype = NAT_CON_TYPE_LU,
+ .contype = FLT_CON_TYPE_LU,
.nat_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.nat_lu_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.bsc_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
@@ -764,7 +764,7 @@ static struct cr_filter cr_filter[] = {
.result = 1,
.nat_imsi_deny = "[0-9]*",
.bsc_imsi_allow = "2440[0-9]*",
- .contype = NAT_CON_TYPE_LU,
+ .contype = FLT_CON_TYPE_LU,
.nat_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.nat_lu_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.bsc_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
@@ -779,7 +779,7 @@ static struct cr_filter cr_filter[] = {
.result = 1,
.bsc_imsi_allow = "[0-9]*",
.nat_imsi_deny = "[0-9]*",
- .contype = NAT_CON_TYPE_LU,
+ .contype = FLT_CON_TYPE_LU,
.nat_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.nat_lu_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.bsc_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
@@ -795,7 +795,7 @@ static struct cr_filter cr_filter[] = {
.bsc_imsi_deny = "[0-9]*",
.bsc_imsi_allow = "[0-9]*",
.nat_imsi_deny = "[0-9]*",
- .contype = NAT_CON_TYPE_LU,
+ .contype = FLT_CON_TYPE_LU,
.nat_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.nat_lu_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.bsc_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
@@ -810,7 +810,7 @@ static struct cr_filter cr_filter[] = {
.result = -3,
.bsc_imsi_deny = "000[0-9]*",
.nat_imsi_deny = "[0-9]*",
- .contype = NAT_CON_TYPE_LU,
+ .contype = FLT_CON_TYPE_LU,
.nat_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.nat_lu_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.bsc_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
@@ -825,7 +825,7 @@ static struct cr_filter cr_filter[] = {
.result = -3,
.bsc_imsi_deny = "000[0-9]*",
.nat_imsi_deny = "[0-9]*",
- .contype = NAT_CON_TYPE_LU,
+ .contype = FLT_CON_TYPE_LU,
.nat_cm_reject_cause = 0x23,
.nat_lu_reject_cause = 0x42,
.bsc_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
@@ -839,7 +839,7 @@ static struct cr_filter cr_filter[] = {
.length = sizeof(bss_lu),
.result = -2,
.bsc_imsi_deny = "[0-9]*",
- .contype = NAT_CON_TYPE_LU,
+ .contype = FLT_CON_TYPE_LU,
.nat_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.nat_lu_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.bsc_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
@@ -853,7 +853,7 @@ static struct cr_filter cr_filter[] = {
.length = sizeof(bss_lu),
.result = -2,
.bsc_imsi_deny = "[0-9]*",
- .contype = NAT_CON_TYPE_LU,
+ .contype = FLT_CON_TYPE_LU,
.nat_cm_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.nat_lu_reject_cause = GSM48_REJECT_PLMN_NOT_ALLOWED,
.bsc_cm_reject_cause = 0x42,