diff options
author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2015-04-05 21:03:49 +0200 |
---|---|---|
committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2015-05-03 22:09:02 +0200 |
commit | c652913674ecc30f8d234878a17baa623cbacf99 (patch) | |
tree | 09897c3d57db4568552461c824ad5696b5e7f704 /openbsc/include | |
parent | 06a88fa0ae1f86cef0a23a1462bfef950418ea36 (diff) |
filter: Move the con_type into the filter_state
Diffstat (limited to 'openbsc/include')
-rw-r--r-- | openbsc/include/openbsc/bsc_msg_filter.h | 12 | ||||
-rw-r--r-- | openbsc/include/openbsc/bsc_nat.h | 10 | ||||
-rw-r--r-- | openbsc/include/openbsc/bsc_nat_sccp.h | 1 |
3 files changed, 12 insertions, 11 deletions
diff --git a/openbsc/include/openbsc/bsc_msg_filter.h b/openbsc/include/openbsc/bsc_msg_filter.h index b09cd8aa6..a9dedf43c 100644 --- a/openbsc/include/openbsc/bsc_msg_filter.h +++ b/openbsc/include/openbsc/bsc_msg_filter.h @@ -53,9 +53,21 @@ struct bsc_msg_acc_lst_entry { int lu_reject_cause; }; +enum { + FLT_CON_TYPE_NONE, + FLT_CON_TYPE_LU, + FLT_CON_TYPE_CM_SERV_REQ, + FLT_CON_TYPE_PAG_RESP, + FLT_CON_TYPE_SSA, + FLT_CON_TYPE_LOCAL_REJECT, + FLT_CON_TYPE_OTHER, +}; + + struct bsc_filter_state { char *imsi; int imsi_checked; + int con_type; }; struct bsc_filter_request { diff --git a/openbsc/include/openbsc/bsc_nat.h b/openbsc/include/openbsc/bsc_nat.h index 10f11a62b..ae940b390 100644 --- a/openbsc/include/openbsc/bsc_nat.h +++ b/openbsc/include/openbsc/bsc_nat.h @@ -48,16 +48,6 @@ struct bsc_nat; struct bsc_nat_ussd_con; struct nat_rewrite_rule; -enum { - NAT_CON_TYPE_NONE, - NAT_CON_TYPE_LU, - NAT_CON_TYPE_CM_SERV_REQ, - NAT_CON_TYPE_PAG_RESP, - NAT_CON_TYPE_SSA, - NAT_CON_TYPE_LOCAL_REJECT, - NAT_CON_TYPE_OTHER, -}; - /* * Is this terminated to the MSC, to the local machine (release * handling for IMSI filtering) or to a USSD provider? diff --git a/openbsc/include/openbsc/bsc_nat_sccp.h b/openbsc/include/openbsc/bsc_nat_sccp.h index d2490ca6a..082466408 100644 --- a/openbsc/include/openbsc/bsc_nat_sccp.h +++ b/openbsc/include/openbsc/bsc_nat_sccp.h @@ -79,7 +79,6 @@ struct nat_sccp_connection { int has_remote_ref; /* status */ - int con_type; int con_local; int authorized; |