diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2015-04-05 19:13:27 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2015-05-03 21:59:29 +0200 |
| commit | c09f8a3b7fb94ccef41e33c32bfe2bff1ffe0e44 (patch) | |
| tree | f58b0988f0c43311fba85579c14a42d3426b5c6e /openbsc/include | |
| parent | 81dbfe412c8196df443f38bf4fbea4f9897607ef (diff) | |
filter: Remove nat_sccp_connection from public API
Diffstat (limited to 'openbsc/include')
| -rw-r--r-- | openbsc/include/openbsc/bsc_msg_filter.h | 9 | ||||
| -rw-r--r-- | openbsc/include/openbsc/bsc_nat_sccp.h | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/openbsc/include/openbsc/bsc_msg_filter.h b/openbsc/include/openbsc/bsc_msg_filter.h index a974195c8..64890500c 100644 --- a/openbsc/include/openbsc/bsc_msg_filter.h +++ b/openbsc/include/openbsc/bsc_msg_filter.h @@ -11,9 +11,7 @@ struct vty; struct gsm48_hdr; /* TODO: remove */ -struct bsc_nat_parsed; struct bsc_connection; -struct nat_sccp_connection; struct bsc_filter_reject_cause { int lu_reject_cause; @@ -58,6 +56,11 @@ struct bsc_msg_acc_lst_entry { int lu_reject_cause; }; +struct bsc_filter_state { + char *imsi; + int imsi_checked; +}; + int bsc_filter_barr_adapt(void *ctx, struct rb_root *rbtree, const struct osmo_config_list *); int bsc_filter_barr_find(struct rb_root *root, const char *imsi, int *cm, int *lu); @@ -71,7 +74,7 @@ int bsc_msg_filter_initial(struct gsm48_hdr *hdr, size_t size, struct bsc_filter_reject_cause *cause); int bsc_msg_filter_data(struct gsm48_hdr *hdr, size_t size, struct bsc_connection *bsc, - struct nat_sccp_connection *con, + struct bsc_filter_state *state, struct bsc_filter_reject_cause *cause); /* IMSI allow/deny handling */ diff --git a/openbsc/include/openbsc/bsc_nat_sccp.h b/openbsc/include/openbsc/bsc_nat_sccp.h index 0561df1f4..d2490ca6a 100644 --- a/openbsc/include/openbsc/bsc_nat_sccp.h +++ b/openbsc/include/openbsc/bsc_nat_sccp.h @@ -22,6 +22,8 @@ #ifndef BSC_NAT_SCCP_H #define BSC_NAT_SCCP_H +#include "bsc_msg_filter.h" + #include <osmocom/sccp/sccp_types.h> /* @@ -80,8 +82,8 @@ struct nat_sccp_connection { int con_type; int con_local; int authorized; - int imsi_checked; - char *imsi; + + struct bsc_filter_state filter_state; uint16_t lac; uint16_t ci; |