filter: Move the con_type into the filter_state
diff --git a/openbsc/include/openbsc/bsc_msg_filter.h b/openbsc/include/openbsc/bsc_msg_filter.h
index b09cd8a..a9dedf4 100644
--- a/openbsc/include/openbsc/bsc_msg_filter.h
+++ b/openbsc/include/openbsc/bsc_msg_filter.h
@@ -53,9 +53,21 @@
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 10f11a6..ae940b3 100644
--- a/openbsc/include/openbsc/bsc_nat.h
+++ b/openbsc/include/openbsc/bsc_nat.h
@@ -48,16 +48,6 @@
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 d2490ca..0824664 100644
--- a/openbsc/include/openbsc/bsc_nat_sccp.h
+++ b/openbsc/include/openbsc/bsc_nat_sccp.h
@@ -79,7 +79,6 @@
int has_remote_ref;
/* status */
- int con_type;
int con_local;
int authorized;