January 2023 - gerrit-log - lists.osmocom.org

Change in osmo-sgsn[master]: Split gprs_sgsn.{c,h} -> {auth,mmctx,sgsn}.{c,h}

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30904 to look at the new patch set (#3). Change subject: Split gprs_sgsn.{c,h} -> {auth,mmctx,sgsn}.{c,h} ...................................................................... Split gprs_sgsn.{c,h} -> {auth,mmctx,sgsn}.{c,h} Some level of split already existed, like sgsn_auth.c, but headers were entangled together. Let's clearly separate application centric code (sgsn.c/h), auth related code (auth.c/h) and mmctx related code (mmctx.c/h). Change-Id: I048a082851c1275c959649942904205b02acce2a --- M include/osmocom/sgsn/Makefile.am A include/osmocom/sgsn/auth.h M include/osmocom/sgsn/gprs_gmm.h M include/osmocom/sgsn/gprs_gmm_fsm.h M include/osmocom/sgsn/gprs_llc.h M include/osmocom/sgsn/gprs_ranap.h M include/osmocom/sgsn/gprs_sm.h M include/osmocom/sgsn/gprs_sndcp.h R include/osmocom/sgsn/mmctx.h M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_llc_parse.c M src/sgsn/Makefile.am M src/sgsn/gprs_bssgp.c M src/sgsn/gprs_gmm.c M src/sgsn/gprs_gmm_attach.c M src/sgsn/gprs_llc.c M src/sgsn/gprs_mm_state_gb_fsm.c M src/sgsn/gprs_mm_state_iu_fsm.c M src/sgsn/gprs_ns.c M src/sgsn/gprs_ranap.c M src/sgsn/gprs_sm.c M src/sgsn/gprs_sndcp.c M src/sgsn/gprs_subscriber.c R src/sgsn/mmctx.c M src/sgsn/pdpctx.c A src/sgsn/sgsn.c M src/sgsn/sgsn_auth.c M src/sgsn/sgsn_cdr.c M src/sgsn/sgsn_ctrl.c M src/sgsn/sgsn_libgtp.c M src/sgsn/sgsn_vty.c M tests/sgsn/Makefile.am M tests/sgsn/gprs_gb_parse.c 33 files changed, 311 insertions(+), 221 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/04/30904/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I048a082851c1275c959649942904205b02acce2a Gerrit-Change-Number: 30904 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 5 months

1
0
0 0

Change in osmo-sgsn[master]: Split gprs_sgsn.{c,h} -> {auth,mmctx,sgsn}.{c,h}

by Jenkins Builder

Attention is currently required from: pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30904 ) Change subject: Split gprs_sgsn.{c,h} -> {auth,mmctx,sgsn}.{c,h} ...................................................................... Patch Set 2: (1 comment) File include/osmocom/sgsn/auth.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2511): https://gerrit.osmocom.org/c/osmo-sgsn/+/30904/comment/207d1848_f1d747bf PS2, Line 36: int sgsn_acl_del(const char *imsi, struct sgsn_config *cfg); adding a line without newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I048a082851c1275c959649942904205b02acce2a Gerrit-Change-Number: 30904 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 09 Jan 2023 12:47:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-sgsn[master]: gtphub.h: Remove dependency on sgsn/gprs_sgsn.h

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30903 to look at the new patch set (#2). Change subject: gtphub.h: Remove dependency on sgsn/gprs_sgsn.h ...................................................................... gtphub.h: Remove dependency on sgsn/gprs_sgsn.h It is only really needed to import define GSM_APN_LENGTH, which is actually also available in libosmogsm. Hence simply use the one from libosmogsm. Change-Id: I4c6110feeeaa1adfb6b1f0147eeb56dfe34636ec --- M include/osmocom/gtphub/gtphub.h M src/gtphub/gtphub.c M src/gtphub/gtphub_ares.c M src/gtphub/gtphub_main.c M src/gtphub/gtphub_sock.c M tests/gtphub/gtphub_test.c 6 files changed, 14 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/03/30903/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4c6110feeeaa1adfb6b1f0147eeb56dfe34636ec Gerrit-Change-Number: 30903 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 5 months

1
0
0 0

Change in osmo-sgsn[master]: Split gprs_sgsn.{c,h} -> {auth,mmctx,sgsn}.{c,h}

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30904 ) Change subject: Split gprs_sgsn.{c,h} -> {auth,mmctx,sgsn}.{c,h} ...................................................................... Patch Set 1: (1 comment) File include/osmocom/sgsn/auth.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2510): https://gerrit.osmocom.org/c/osmo-sgsn/+/30904/comment/fd649e88_7c9a3016 PS1, Line 36: int sgsn_acl_del(const char *imsi, struct sgsn_config *cfg); adding a line without newline at end of file -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I048a082851c1275c959649942904205b02acce2a Gerrit-Change-Number: 30904 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 09 Jan 2023 12:36:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-sgsn[master]: gtphub.h: Remove dependency on sgsn/gprs_sgsn.h

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30903 ) Change subject: gtphub.h: Remove dependency on sgsn/gprs_sgsn.h ...................................................................... gtphub.h: Remove dependency on sgsn/gprs_sgsn.h It is only really needed to import define GSM_APN_LENGTH, which is actually also available in libosmogsm. Hence simply use the one from libosmogsm. Change-Id: I4c6110feeeaa1adfb6b1f0147eeb56dfe34636ec --- M include/osmocom/gtphub/gtphub.h M src/gtphub/gtphub.c M src/gtphub/gtphub_ares.c M src/gtphub/gtphub_sock.c M tests/gtphub/gtphub_test.c 5 files changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/03/30903/1 diff --git a/include/osmocom/gtphub/gtphub.h b/include/osmocom/gtphub/gtphub.h index 6a439b5..dbf8469 100644 --- a/include/osmocom/gtphub/gtphub.h +++ b/include/osmocom/gtphub/gtphub.h @@ -27,9 +27,7 @@ #include <osmocom/core/select.h> #include <osmocom/core/timer.h> #include <osmocom/core/rate_ctr.h> - -#include <osmocom/sgsn/gprs_sgsn.h> - +#include <osmocom/gsm/apn.h> /* support */ @@ -428,7 +426,7 @@ /* The APN OI, the Operator Identifier, is the combined address, * including parts of the IMSI and APN NI, and ending with ".gprs". */ - char apn_oi_str[GSM_APN_LENGTH]; + char apn_oi_str[APN_MAXLEN+1]; /* Which address and port we resolved that to. */ struct gtphub_peer_port *peer; diff --git a/src/gtphub/gtphub.c b/src/gtphub/gtphub.c index 2b00f59..937e6a4 100644 --- a/src/gtphub/gtphub.c +++ b/src/gtphub/gtphub.c @@ -475,7 +475,7 @@ * present but cannot be decoded. */ static int get_ie_apn_str(union gtpie_member *ie[], const char **apn_str) { - static char apn_buf[GSM_APN_LENGTH]; + static char apn_buf[APN_MAXLEN+1]; unsigned int len; if (gtpie_gettlv(ie, GTPIE_APN, 0, &len, apn_buf, sizeof(apn_buf)) != 0) diff --git a/src/gtphub/gtphub_ares.c b/src/gtphub/gtphub_ares.c index a2d8a4a..774563d 100644 --- a/src/gtphub/gtphub_ares.c +++ b/src/gtphub/gtphub_ares.c @@ -33,6 +33,7 @@ #include <osmocom/core/utils.h> #include <osmocom/gsm/apn.h> +#include <osmocom/gsm/protocol/gsm_23_003.h> /* TODO split GRX ares from sgsn into a separate struct and allow use without * globals. */ @@ -56,8 +57,8 @@ struct gtphub *hub; char imsi_str[GSM23003_IMSI_MAX_DIGITS+1]; - char apn_ni_str[GSM_APN_LENGTH]; - char apn_oi_str[GSM_APN_LENGTH]; + char apn_ni_str[APN_MAXLEN+1]; + char apn_oi_str[APN_MAXLEN+1]; int have_3dig_mnc; }; diff --git a/src/gtphub/gtphub_sock.c b/src/gtphub/gtphub_sock.c index 59a0d42..6f299d2 100644 --- a/src/gtphub/gtphub_sock.c +++ b/src/gtphub/gtphub_sock.c @@ -25,6 +25,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <errno.h> +#include <string.h> + +#include <osmocom/core/utils.h> + #include <osmocom/gtphub/gtphub.h> #include <osmocom/sgsn/debug.h> diff --git a/tests/gtphub/gtphub_test.c b/tests/gtphub/gtphub_test.c index 4f58315..5fa730a 100644 --- a/tests/gtphub/gtphub_test.c +++ b/tests/gtphub/gtphub_test.c @@ -27,6 +27,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/application.h> +#include <osmocom/gsm/protocol/gsm_23_003.h> #include <osmocom/sgsn/debug.h> @@ -376,7 +377,7 @@ } char resolve_ggsn_got_imsi[GSM23003_IMSI_MAX_DIGITS+1]; -char resolve_ggsn_got_ni[GSM_APN_LENGTH]; +char resolve_ggsn_got_ni[APN_MAXLEN+1]; struct sgsn_sockaddr resolved_ggsn_addr; static int resolve_to_ggsn(const char *addr, uint16_t port) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4c6110feeeaa1adfb6b1f0147eeb56dfe34636ec Gerrit-Change-Number: 30903 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-sgsn[master]: Split gprs_sgsn.{c,h} -> {auth,mmctx,sgsn}.{c,h}

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30904 ) Change subject: Split gprs_sgsn.{c,h} -> {auth,mmctx,sgsn}.{c,h} ...................................................................... Split gprs_sgsn.{c,h} -> {auth,mmctx,sgsn}.{c,h} Some level of split already existed, like sgsn_auth.c, but headers were entangled together. Let's clearly separate application centric code (sgsn.c/h), auth related code (auth.c/h) and mmctx related code (mmctx.c/h). Change-Id: I048a082851c1275c959649942904205b02acce2a --- M include/osmocom/sgsn/Makefile.am A include/osmocom/sgsn/auth.h M include/osmocom/sgsn/gprs_gmm.h M include/osmocom/sgsn/gprs_gmm_fsm.h M include/osmocom/sgsn/gprs_llc.h M include/osmocom/sgsn/gprs_ranap.h M include/osmocom/sgsn/gprs_sm.h M include/osmocom/sgsn/gprs_sndcp.h R include/osmocom/sgsn/mmctx.h M include/osmocom/sgsn/sgsn.h M src/gprs/gprs_llc_parse.c M src/sgsn/Makefile.am M src/sgsn/gprs_bssgp.c M src/sgsn/gprs_gmm.c M src/sgsn/gprs_gmm_attach.c M src/sgsn/gprs_llc.c M src/sgsn/gprs_mm_state_gb_fsm.c M src/sgsn/gprs_mm_state_iu_fsm.c M src/sgsn/gprs_ns.c M src/sgsn/gprs_ranap.c M src/sgsn/gprs_sm.c M src/sgsn/gprs_sndcp.c M src/sgsn/gprs_subscriber.c R src/sgsn/mmctx.c M src/sgsn/pdpctx.c A src/sgsn/sgsn.c M src/sgsn/sgsn_auth.c M src/sgsn/sgsn_cdr.c M src/sgsn/sgsn_ctrl.c M src/sgsn/sgsn_libgtp.c M src/sgsn/sgsn_vty.c M tests/sgsn/Makefile.am M tests/sgsn/gprs_gb_parse.c 33 files changed, 311 insertions(+), 221 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/04/30904/1 diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am index 017954d..aa6cd0f 100644 --- a/include/osmocom/sgsn/Makefile.am +++ b/include/osmocom/sgsn/Makefile.am @@ -1,5 +1,6 @@ noinst_HEADERS = \ apn.h \ + auth.h \ common.h \ crc24.h \ debug.h \ @@ -13,7 +14,6 @@ gprs_llc.h \ gprs_llc_xid.h \ gprs_ranap.h \ - gprs_sgsn.h \ gprs_sm.h \ gprs_sndcp_comp.h \ gprs_sndcp_dcomp.h \ @@ -25,6 +25,7 @@ gtp.h \ gtp_ggsn.h \ gtp_mme.h \ + mmctx.h \ pdpctx.h \ sgsn.h \ sgsn_rim.h \ diff --git a/include/osmocom/sgsn/auth.h b/include/osmocom/sgsn/auth.h new file mode 100644 index 0000000..4e8b760 --- /dev/null +++ b/include/osmocom/sgsn/auth.h @@ -0,0 +1,36 @@ +/* MS authorization and subscriber data handling */ +#pragma once + +struct sgsn_config; +struct sgsn_instance; +struct sgsn_mm_ctx; + +/* Authorization/ACL handling */ +enum sgsn_auth_state { + SGSN_AUTH_UNKNOWN, + SGSN_AUTH_AUTHENTICATE, + SGSN_AUTH_UMTS_RESYNC, + SGSN_AUTH_ACCEPTED, + SGSN_AUTH_REJECTED +}; + +extern const struct value_string *sgsn_auth_state_names; + +void sgsn_auth_init(struct sgsn_instance *sgsn); +/* Request authorization */ +enum sgsn_auth_state sgsn_auth_state(struct sgsn_mm_ctx *mm); +int sgsn_auth_request(struct sgsn_mm_ctx *mm); +void sgsn_auth_update(struct sgsn_mm_ctx *mm); +struct gsm_auth_tuple *sgsn_auth_get_tuple(struct sgsn_mm_ctx *mmctx, + unsigned key_seq); + +/* + * Authorization/ACL handling + */ +struct imsi_acl_entry { + struct llist_head list; + char imsi[OSMO_IMSI_BUF_SIZE]; +}; +struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, const struct sgsn_config *cfg); +int sgsn_acl_add(const char *imsi, struct sgsn_config *cfg); +int sgsn_acl_del(const char *imsi, struct sgsn_config *cfg); \ No newline at end of file diff --git a/include/osmocom/sgsn/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h index 0d04280..71dd1fa 100644 --- a/include/osmocom/sgsn/gprs_gmm.h +++ b/include/osmocom/sgsn/gprs_gmm.h @@ -1,11 +1,15 @@ #ifndef _GPRS_GMM_H #define _GPRS_GMM_H -#include <osmocom/core/msgb.h> -#include <osmocom/sgsn/gprs_sgsn.h> - #include <stdbool.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/gsm48.h> +#include <osmocom/crypt/auth.h> + +struct sgsn_mm_ctx; +struct gprs_llc_llme; + int gsm48_tx_gmm_auth_ciph_req(struct sgsn_mm_ctx *mm, const struct osmo_auth_vector *vec, uint8_t key_seq, bool force_standby); diff --git a/include/osmocom/sgsn/gprs_gmm_fsm.h b/include/osmocom/sgsn/gprs_gmm_fsm.h index f10851e..2f0e81a 100644 --- a/include/osmocom/sgsn/gprs_gmm_fsm.h +++ b/include/osmocom/sgsn/gprs_gmm_fsm.h @@ -1,8 +1,10 @@ #pragma once #include <osmocom/core/fsm.h> -#include <osmocom/sgsn/gprs_sgsn.h> +#include <osmocom/sgsn/mmctx.h> + +struct gprs_llc_llme; /* 3GPP TS 24.008 § 4.1.3.3 GMM mobility management states on the network side */ enum gmm_fsm_states { diff --git a/include/osmocom/sgsn/gprs_llc.h b/include/osmocom/sgsn/gprs_llc.h index 32b16b0..6f0e492 100644 --- a/include/osmocom/sgsn/gprs_llc.h +++ b/include/osmocom/sgsn/gprs_llc.h @@ -2,9 +2,15 @@ #include <stdint.h> #include <stdbool.h> -#include <osmocom/sgsn/gprs_sgsn.h> + +#include <osmocom/core/timer.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/crypt/gprs_cipher.h> + #include <osmocom/sgsn/gprs_llc_xid.h> +struct sgsn_mm_ctx; + /* Section 4.7 LLC Layer Structure */ enum gprs_llc_sapi { GPRS_SAPI_GMM = 1, diff --git a/include/osmocom/sgsn/gprs_ranap.h b/include/osmocom/sgsn/gprs_ranap.h index 62fdf6f..68f9115 100644 --- a/include/osmocom/sgsn/gprs_ranap.h +++ b/include/osmocom/sgsn/gprs_ranap.h @@ -1,13 +1,15 @@ #pragma once #include <osmocom/core/msgb.h> -#include <osmocom/sgsn/gprs_sgsn.h> #ifdef BUILD_IU #include <osmocom/ranap/ranap_ies_defs.h> #include <osmocom/ranap/ranap_msg_factory.h> #include <osmocom/ranap/iu_client.h> +struct sgsn_mm_ctx; +struct sgsn_pdp_ctx; + void activate_pdp_rabs(struct sgsn_mm_ctx *ctx); int sgsn_ranap_iu_event(struct ranap_ue_conn_ctx *ctx, enum ranap_iu_event_type type, void *data); int iu_rab_act_ps(uint8_t rab_id, struct sgsn_pdp_ctx *pdp); diff --git a/include/osmocom/sgsn/gprs_sm.h b/include/osmocom/sgsn/gprs_sm.h index 55c95b8..78bb2d8 100644 --- a/include/osmocom/sgsn/gprs_sm.h +++ b/include/osmocom/sgsn/gprs_sm.h @@ -1,7 +1,10 @@ #pragma once #include <osmocom/core/msgb.h> -#include <osmocom/sgsn/gprs_sgsn.h> + +struct sgsn_mm_ctx; +struct sgsn_pdp_ctx; +struct gprs_llc_llme; int gsm48_tx_gsm_deact_pdp_req(struct sgsn_pdp_ctx *pdp, uint8_t sm_cause, bool teardown); int gsm48_tx_gsm_act_pdp_rej(struct sgsn_mm_ctx *mm, uint8_t tid, diff --git a/include/osmocom/sgsn/gprs_sndcp.h b/include/osmocom/sgsn/gprs_sndcp.h index b4a0af8..30ea053 100644 --- a/include/osmocom/sgsn/gprs_sndcp.h +++ b/include/osmocom/sgsn/gprs_sndcp.h @@ -3,6 +3,9 @@ #include <stdint.h> #include <osmocom/core/linuxlist.h> +#include <osmocom/gsm/gsm48.h> + +struct gprs_llc_lle; /* A fragment queue header, maintaining list of fragments for one N-PDU */ struct defrag_state { diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/mmctx.h similarity index 87% rename from include/osmocom/sgsn/gprs_sgsn.h rename to include/osmocom/sgsn/mmctx.h index c9e301d..dd78124 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/mmctx.h @@ -1,5 +1,4 @@ -#ifndef _GPRS_SGSN_H -#define _GPRS_SGSN_H +#pragma once #include <stdint.h> #include <netinet/in.h> @@ -15,6 +14,7 @@ #include <osmocom/crypt/auth.h> #include <osmocom/sgsn/apn.h> +#include <osmocom/sgsn/auth.h> #include <osmocom/sgsn/gprs_subscriber.h> #define GSM_EXTENSION_LENGTH 15 @@ -48,17 +48,6 @@ GMM_T3350_MODE_PTMSI_REALL, }; -/* Authorization/ACL handling */ -enum sgsn_auth_state { - SGSN_AUTH_UNKNOWN, - SGSN_AUTH_AUTHENTICATE, - SGSN_AUTH_UMTS_RESYNC, - SGSN_AUTH_ACCEPTED, - SGSN_AUTH_REJECTED -}; - -#define MS_RADIO_ACCESS_CAPA - enum sgsn_ggsn_lookup_state { SGSN_GGSN_2DIGIT, SGSN_GGSN_3DIGIT, @@ -296,32 +285,5 @@ uint32_t sgsn_alloc_ptmsi(void); -/* - * Authorization/ACL handling - */ -struct imsi_acl_entry { - struct llist_head list; - char imsi[OSMO_IMSI_BUF_SIZE]; -}; - -#define SGSN_ERROR_CAUSE_NONE (-1) - -struct sgsn_config; -struct sgsn_instance; -extern const struct value_string *sgsn_auth_state_names; - -void sgsn_auth_init(struct sgsn_instance *sgsn); -struct imsi_acl_entry *sgsn_acl_lookup(const char *imsi, const struct sgsn_config *cfg); -int sgsn_acl_add(const char *imsi, struct sgsn_config *cfg); -int sgsn_acl_del(const char *imsi, struct sgsn_config *cfg); -/* Request authorization */ -int sgsn_auth_request(struct sgsn_mm_ctx *mm); -enum sgsn_auth_state sgsn_auth_state(struct sgsn_mm_ctx *mm); -void sgsn_auth_update(struct sgsn_mm_ctx *mm); -struct gsm_auth_tuple *sgsn_auth_get_tuple(struct sgsn_mm_ctx *mmctx, - unsigned key_seq); - /* Called on subscriber data updates */ void sgsn_update_subscriber_data(struct sgsn_mm_ctx *mmctx); - -#endif /* _GPRS_SGSN_H */ diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index aadb8a7..0963863 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -8,7 +8,7 @@ #include <osmocom/gprs/gprs_ns2.h> #include <osmocom/gprs/gprs_bssgp.h> -#include <osmocom/sgsn/gprs_sgsn.h> +#include <osmocom/sgsn/auth.h> #include <osmocom/sgsn/gtp_mme.h> #include <osmocom/gsm/oap_client.h> #include <osmocom/gsupclient/gsup_client.h> @@ -25,6 +25,8 @@ struct hostent; +#define SGSN_ERROR_CAUSE_NONE (-1) + enum sgsn_auth_policy { SGSN_AUTH_POLICY_OPEN, SGSN_AUTH_POLICY_CLOSED, diff --git a/src/gprs/gprs_llc_parse.c b/src/gprs/gprs_llc_parse.c index e400e25..d099cda 100644 --- a/src/gprs/gprs_llc_parse.c +++ b/src/gprs/gprs_llc_parse.c @@ -29,7 +29,7 @@ #include <osmocom/gprs/gprs_bssgp.h> #include <osmocom/sgsn/debug.h> -#include <osmocom/sgsn/gprs_sgsn.h> +#include <osmocom/sgsn/mmctx.h> #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/gprs_llc.h> #include <osmocom/sgsn/crc24.h> diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am index 75f9608..93b9fa0 100644 --- a/src/sgsn/Makefile.am +++ b/src/sgsn/Makefile.am @@ -47,7 +47,6 @@ gprs_gmm_fsm.c \ gprs_mm_state_gb_fsm.c \ gprs_ns.c \ - gprs_sgsn.c \ gprs_sm.c \ gprs_sndcp.c \ gprs_sndcp_comp.c \ @@ -57,11 +56,13 @@ gprs_sndcp_xid.c \ gtp_ggsn.c \ gtp_mme.c \ + sgsn.c \ sgsn_main.c \ sgsn_vty.c \ sgsn_libgtp.c \ gprs_llc.c \ gprs_llc_vty.c \ + mmctx.c \ pdpctx.c \ sgsn_ctrl.c \ sgsn_auth.c \ diff --git a/src/sgsn/gprs_bssgp.c b/src/sgsn/gprs_bssgp.c index d6bd25f..5db751c 100644 --- a/src/sgsn/gprs_bssgp.c +++ b/src/sgsn/gprs_bssgp.c @@ -29,6 +29,7 @@ #include <osmocom/sgsn/gprs_llc.h> #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/sgsn_rim.h> +#include <osmocom/sgsn/mmctx.h> /* call-back function for the BSSGP protocol */ int sgsn_bssgp_rx_prim(struct osmo_prim_hdr *oph) diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index 35f28ec..8977e41 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -48,7 +48,7 @@ #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/gprs_llc.h> -#include <osmocom/sgsn/gprs_sgsn.h> +#include <osmocom/sgsn/mmctx.h> #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/gprs_utils.h> #include <osmocom/sgsn/gprs_subscriber.h> diff --git a/src/sgsn/gprs_gmm_attach.c b/src/sgsn/gprs_gmm_attach.c index 59417df..708ea8f 100644 --- a/src/sgsn/gprs_gmm_attach.c +++ b/src/sgsn/gprs_gmm_attach.c @@ -6,6 +6,7 @@ #include <osmocom/gsm/protocol/gsm_04_08_gprs.h> #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/gprs_gmm.h> +#include <osmocom/sgsn/mmctx.h> #include <osmocom/sgsn/sgsn.h> #define X(s) (1 << (s)) diff --git a/src/sgsn/gprs_llc.c b/src/sgsn/gprs_llc.c index 302e018..6f56385 100644 --- a/src/sgsn/gprs_llc.c +++ b/src/sgsn/gprs_llc.c @@ -33,7 +33,7 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/sgsn/debug.h> -#include <osmocom/sgsn/gprs_sgsn.h> +#include <osmocom/sgsn/mmctx.h> #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/gprs_llc.h> #include <osmocom/sgsn/crc24.h> diff --git a/src/sgsn/gprs_mm_state_gb_fsm.c b/src/sgsn/gprs_mm_state_gb_fsm.c index 6e812d3..5a007e9 100644 --- a/src/sgsn/gprs_mm_state_gb_fsm.c +++ b/src/sgsn/gprs_mm_state_gb_fsm.c @@ -27,6 +27,7 @@ #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/sgsn.h> +#include <osmocom/sgsn/mmctx.h> #define X(s) (1 << (s)) diff --git a/src/sgsn/gprs_mm_state_iu_fsm.c b/src/sgsn/gprs_mm_state_iu_fsm.c index 597507c..5ac0097 100644 --- a/src/sgsn/gprs_mm_state_iu_fsm.c +++ b/src/sgsn/gprs_mm_state_iu_fsm.c @@ -31,6 +31,7 @@ #include <osmocom/sgsn/gprs_ranap.h> #include <osmocom/sgsn/gtp.h> #include <osmocom/sgsn/pdpctx.h> +#include <osmocom/sgsn/mmctx.h> #define X(s) (1 << (s)) diff --git a/src/sgsn/gprs_ns.c b/src/sgsn/gprs_ns.c index e2ff931..eb447fa 100644 --- a/src/sgsn/gprs_ns.c +++ b/src/sgsn/gprs_ns.c @@ -31,7 +31,6 @@ #include "config.h" -#include <osmocom/sgsn/gprs_sgsn.h> #include <osmocom/sgsn/debug.h> void gprs_ns_prim_status_cb(struct osmo_gprs_ns2_prim *nsp) diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c index d3d958d..5e0d8ed 100644 --- a/src/sgsn/gprs_ranap.c +++ b/src/sgsn/gprs_ranap.c @@ -40,6 +40,7 @@ #include <osmocom/sgsn/gtp_ggsn.h> #include <osmocom/sgsn/gtp.h> #include <osmocom/sgsn/pdpctx.h> +#include <osmocom/sgsn/mmctx.h> /* Send RAB activation requests for all PDP contexts */ void activate_pdp_rabs(struct sgsn_mm_ctx *ctx) diff --git a/src/sgsn/gprs_sm.c b/src/sgsn/gprs_sm.c index 1d1923d..e989ddb 100644 --- a/src/sgsn/gprs_sm.c +++ b/src/sgsn/gprs_sm.c @@ -44,6 +44,7 @@ #include <osmocom/sgsn/gprs_ranap.h> #include <osmocom/sgsn/gtp.h> #include <osmocom/sgsn/pdpctx.h> +#include <osmocom/sgsn/mmctx.h> extern void *tall_sgsn_ctx; diff --git a/src/sgsn/gprs_sndcp.c b/src/sgsn/gprs_sndcp.c index 6707c28..36e808f 100644 --- a/src/sgsn/gprs_sndcp.c +++ b/src/sgsn/gprs_sndcp.c @@ -42,6 +42,7 @@ #include <osmocom/sgsn/gprs_sndcp_dcomp.h> #include <osmocom/sgsn/gprs_sndcp_comp.h> #include <osmocom/sgsn/gprs_gmm.h> +#include <osmocom/sgsn/mmctx.h> #include <osmocom/sgsn/gtp.h> #define DEBUG_IP_PACKETS 0 /* 0=Disabled, 1=Enabled */ diff --git a/src/sgsn/gprs_subscriber.c b/src/sgsn/gprs_subscriber.c index 943fbc3..8533cce 100644 --- a/src/sgsn/gprs_subscriber.c +++ b/src/sgsn/gprs_subscriber.c @@ -30,7 +30,7 @@ #include <osmocom/gsupclient/gsup_client.h> #include <osmocom/sgsn/sgsn.h> -#include <osmocom/sgsn/gprs_sgsn.h> +#include <osmocom/sgsn/mmctx.h> #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/gprs_utils.h> diff --git a/src/sgsn/gprs_sgsn.c b/src/sgsn/mmctx.c similarity index 75% rename from src/sgsn/gprs_sgsn.c rename to src/sgsn/mmctx.c index 884da76..e1ea9be 100644 --- a/src/sgsn/gprs_sgsn.c +++ b/src/sgsn/mmctx.c @@ -1,4 +1,4 @@ -/* GPRS SGSN functionality */ +/* Mobilit Management context */ /* (C) 2009 by Harald Welte <laforge(a)gnumonks.org> * @@ -38,7 +38,7 @@ #include <osmocom/sgsn/gprs_subscriber.h> #include <osmocom/sgsn/debug.h> -#include <osmocom/sgsn/gprs_sgsn.h> +#include <osmocom/sgsn/mmctx.h> #include <osmocom/sgsn/sgsn.h> #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/gprs_sm.h> @@ -60,12 +60,6 @@ #include "../../config.h" -#define GPRS_LLME_CHECK_TICK 30 - -extern struct sgsn_instance *sgsn; -extern void *tall_sgsn_ctx; -extern struct osmo_tdef sgsn_T_defs[]; - LLIST_HEAD(sgsn_mm_ctxts); const struct value_string sgsn_ran_type_names[] = { @@ -99,40 +93,6 @@ .class_id = OSMO_STATS_CLASS_SUBSCRIBER, }; -static const struct rate_ctr_desc sgsn_ctr_description[] = { - { "llc:dl_bytes", "Count sent LLC bytes before giving it to the bssgp layer" }, - { "llc:ul_bytes", "Count successful received LLC bytes (encrypt & fcs correct)" }, - { "llc:dl_packets", "Count successful sent LLC packets before giving it to the bssgp layer" }, - { "llc:ul_packets", "Count successful received LLC packets (encrypt & fcs correct)" }, - { "gprs:attach_requested", "Received attach requests" }, - { "gprs:attach_accepted", "Sent attach accepts" }, - { "gprs:attach_rejected", "Sent attach rejects" }, - { "gprs:detach_requested", "Received detach requests" }, - { "gprs:detach_acked", "Sent detach acks" }, - { "gprs:routing_area_requested", "Received routing area requests" }, - { "gprs:routing_area_requested", "Sent routing area acks" }, - { "gprs:routing_area_requested", "Sent routing area rejects" }, - { "pdp:activate_requested", "Received activate requests" }, - { "pdp:activate_rejected", "Sent activate rejects" }, - { "pdp:activate_accepted", "Sent activate accepts" }, - { "pdp:request_activated", "unused" }, - { "pdp:request_activate_rejected", "unused" }, - { "pdp:modify_requested", "unused" }, - { "pdp:modify_accepted", "unused" }, - { "pdp:dl_deactivate_requested", "Sent deactivate requests" }, - { "pdp:dl_deactivate_accepted", "Sent deactivate accepted" }, - { "pdp:ul_deactivate_requested", "Received deactivate requests" }, - { "pdp:ul_deactivate_accepted", "Received deactivate accepts" }, -}; - -static const struct rate_ctr_group_desc sgsn_ctrg_desc = { - "sgsn", - "SGSN Overall Statistics", - OSMO_STATS_CLASS_GLOBAL, - ARRAY_SIZE(sgsn_ctr_description), - sgsn_ctr_description, -}; - /* look-up an SGSN MM context based on Iu UE context (struct ue_conn_ctx)*/ struct sgsn_mm_ctx *sgsn_mm_ctx_by_ue_ctx(const void *uectx) { @@ -624,121 +584,3 @@ return ggsn; } - -static void sgsn_llme_cleanup_free(struct gprs_llc_llme *llme) -{ - struct sgsn_mm_ctx *mmctx = NULL; - - llist_for_each_entry(mmctx, &sgsn_mm_ctxts, list) { - if (llme == mmctx->gb.llme) { - gsm0408_gprs_access_cancelled(mmctx, SGSN_ERROR_CAUSE_NONE); - return; - } - } - - /* No MM context found */ - LOGP(DGPRS, LOGL_INFO, "Deleting orphaned LLME, TLLI 0x%08x\n", - llme->tlli); - gprs_llgmm_unassign(llme); -} - -static void sgsn_llme_check_cb(void *data_) -{ - struct gprs_llc_llme *llme, *llme_tmp; - struct timespec now_tp; - time_t now, age; - time_t max_age = gprs_max_time_to_idle(); - - int rc; - - rc = osmo_clock_gettime(CLOCK_MONOTONIC, &now_tp); - OSMO_ASSERT(rc >= 0); - now = now_tp.tv_sec; - - LOGP(DGPRS, LOGL_DEBUG, - "Checking for inactive LLMEs, time = %u\n", (unsigned)now); - - llist_for_each_entry_safe(llme, llme_tmp, &gprs_llc_llmes, list) { - if (llme->age_timestamp == GPRS_LLME_RESET_AGE) - llme->age_timestamp = now; - - age = now - llme->age_timestamp; - - if (age > max_age || age < 0) { - LOGP(DGPRS, LOGL_INFO, - "Inactivity timeout for TLLI 0x%08x, age %d\n", - llme->tlli, (int)age); - sgsn_llme_cleanup_free(llme); - } - } - - osmo_timer_schedule(&sgsn->llme_timer, GPRS_LLME_CHECK_TICK, 0); -} - -static int sgsn_instance_talloc_destructor(struct sgsn_instance *sgi) -{ - sgsn_cdr_release(sgi); - osmo_timer_del(&sgi->llme_timer); - rate_ctr_group_free(sgi->rate_ctrs); - return 0; -} - -struct sgsn_instance *sgsn_instance_alloc(void *talloc_ctx) -{ - struct sgsn_instance *inst; - inst = talloc_zero(talloc_ctx, struct sgsn_instance); - - talloc_set_destructor(inst, sgsn_instance_talloc_destructor); - - inst->cfg.gtp_statedir = talloc_strdup(inst, "./"); - inst->cfg.auth_policy = SGSN_AUTH_POLICY_CLOSED; - inst->cfg.require_authentication = true; /* only applies if auth_policy is REMOTE */ - inst->cfg.gsup_server_port = OSMO_GSUP_PORT; - - inst->cfg.T_defs = sgsn_T_defs; - osmo_tdefs_reset(inst->cfg.T_defs); - inst->cfg.T_defs_gtp = gtp_T_defs; - osmo_tdefs_reset(inst->cfg.T_defs_gtp); - - inst->rate_ctrs = rate_ctr_group_alloc(inst, &sgsn_ctrg_desc, 0); - OSMO_ASSERT(inst->rate_ctrs); - - INIT_LLIST_HEAD(&inst->apn_list); - INIT_LLIST_HEAD(&inst->ggsn_list); - INIT_LLIST_HEAD(&inst->mme_list); - INIT_LLIST_HEAD(&inst->pdp_list); - - osmo_timer_setup(&inst->llme_timer, sgsn_llme_check_cb, NULL); - osmo_timer_schedule(&inst->llme_timer, GPRS_LLME_CHECK_TICK, 0); - /* These are mostly setting up stuff not related to VTY cfg, so they can be set up here: */ - sgsn_auth_init(inst); - sgsn_cdr_init(inst); - return inst; -} - -/* To be called after VTY config parsing: */ -int sgsn_inst_init(struct sgsn_instance *sgsn) -{ - int rc; - - /* start control interface after reading config for - * ctrl_vty_get_bind_addr() */ - sgsn->ctrlh = ctrl_interface_setup(NULL, OSMO_CTRL_PORT_SGSN, NULL); - if (!sgsn->ctrlh) { - LOGP(DGPRS, LOGL_ERROR, "Failed to create CTRL interface.\n"); - return -EIO; - } - - rc = sgsn_ctrl_cmds_install(); - if (rc != 0) { - LOGP(DGPRS, LOGL_ERROR, "Failed to install CTRL commands.\n"); - return -EFAULT; - } - - rc = gprs_subscr_init(sgsn); - if (rc < 0) { - LOGP(DGPRS, LOGL_FATAL, "Cannot set up SGSN\n"); - return rc; - } - return 0; -} diff --git a/src/sgsn/pdpctx.c b/src/sgsn/pdpctx.c index 77146fc..70fba20 100644 --- a/src/sgsn/pdpctx.c +++ b/src/sgsn/pdpctx.c @@ -28,7 +28,7 @@ #include <osmocom/core/stats.h> #include <osmocom/sgsn/pdpctx.h> -#include <osmocom/sgsn/gprs_sgsn.h> +#include <osmocom/sgsn/mmctx.h> #include <osmocom/sgsn/sgsn.h> #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/signal.h> diff --git a/src/sgsn/sgsn.c b/src/sgsn/sgsn.c new file mode 100644 index 0000000..73157b1 --- /dev/null +++ b/src/sgsn/sgsn.c @@ -0,0 +1,216 @@ +/* SGS instance */ + +/* (C) 2009 by Harald Welte <laforge(a)gnumonks.org> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdint.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/stats.h> +#include <osmocom/core/backtrace.h> +#include <osmocom/ctrl/control_if.h> +#include <osmocom/ctrl/ports.h> +#include <osmocom/gprs/gprs_ns2.h> +#include <osmocom/gprs/gprs_bssgp.h> +#include <osmocom/gsm/protocol/gsm_04_08_gprs.h> +#include <osmocom/gsm/apn.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/gsup.h> + +#include <osmocom/sgsn/gprs_subscriber.h> +#include <osmocom/sgsn/debug.h> +#include <osmocom/sgsn/sgsn.h> +#include <osmocom/sgsn/gprs_gmm.h> +#include <osmocom/sgsn/gprs_sm.h> +#include <osmocom/sgsn/gprs_utils.h> +#include <osmocom/sgsn/signal.h> +#include <osmocom/sgsn/gprs_gmm_attach.h> +#include <osmocom/sgsn/gprs_mm_state_gb_fsm.h> +#include <osmocom/sgsn/gprs_mm_state_iu_fsm.h> +#include <osmocom/sgsn/gprs_gmm_fsm.h> +#include <osmocom/sgsn/gprs_llc.h> +#include <osmocom/sgsn/gprs_sndcp.h> +#include <osmocom/sgsn/gtp_ggsn.h> +#include <osmocom/sgsn/gtp.h> +#include <osmocom/sgsn/pdpctx.h> + +#include <pdp.h> + +#include <time.h> + +#define GPRS_LLME_CHECK_TICK 30 + +extern struct sgsn_instance *sgsn; +extern void *tall_sgsn_ctx; +extern struct osmo_tdef sgsn_T_defs[]; + +static const struct rate_ctr_desc sgsn_ctr_description[] = { + { "llc:dl_bytes", "Count sent LLC bytes before giving it to the bssgp layer" }, + { "llc:ul_bytes", "Count successful received LLC bytes (encrypt & fcs correct)" }, + { "llc:dl_packets", "Count successful sent LLC packets before giving it to the bssgp layer" }, + { "llc:ul_packets", "Count successful received LLC packets (encrypt & fcs correct)" }, + { "gprs:attach_requested", "Received attach requests" }, + { "gprs:attach_accepted", "Sent attach accepts" }, + { "gprs:attach_rejected", "Sent attach rejects" }, + { "gprs:detach_requested", "Received detach requests" }, + { "gprs:detach_acked", "Sent detach acks" }, + { "gprs:routing_area_requested", "Received routing area requests" }, + { "gprs:routing_area_requested", "Sent routing area acks" }, + { "gprs:routing_area_requested", "Sent routing area rejects" }, + { "pdp:activate_requested", "Received activate requests" }, + { "pdp:activate_rejected", "Sent activate rejects" }, + { "pdp:activate_accepted", "Sent activate accepts" }, + { "pdp:request_activated", "unused" }, + { "pdp:request_activate_rejected", "unused" }, + { "pdp:modify_requested", "unused" }, + { "pdp:modify_accepted", "unused" }, + { "pdp:dl_deactivate_requested", "Sent deactivate requests" }, + { "pdp:dl_deactivate_accepted", "Sent deactivate accepted" }, + { "pdp:ul_deactivate_requested", "Received deactivate requests" }, + { "pdp:ul_deactivate_accepted", "Received deactivate accepts" }, +}; + +static const struct rate_ctr_group_desc sgsn_ctrg_desc = { + "sgsn", + "SGSN Overall Statistics", + OSMO_STATS_CLASS_GLOBAL, + ARRAY_SIZE(sgsn_ctr_description), + sgsn_ctr_description, +}; + +static void sgsn_llme_cleanup_free(struct gprs_llc_llme *llme) +{ + struct sgsn_mm_ctx *mmctx = NULL; + + llist_for_each_entry(mmctx, &sgsn_mm_ctxts, list) { + if (llme == mmctx->gb.llme) { + gsm0408_gprs_access_cancelled(mmctx, SGSN_ERROR_CAUSE_NONE); + return; + } + } + + /* No MM context found */ + LOGP(DGPRS, LOGL_INFO, "Deleting orphaned LLME, TLLI 0x%08x\n", + llme->tlli); + gprs_llgmm_unassign(llme); +} + +static void sgsn_llme_check_cb(void *data_) +{ + struct gprs_llc_llme *llme, *llme_tmp; + struct timespec now_tp; + time_t now, age; + time_t max_age = gprs_max_time_to_idle(); + + int rc; + + rc = osmo_clock_gettime(CLOCK_MONOTONIC, &now_tp); + OSMO_ASSERT(rc >= 0); + now = now_tp.tv_sec; + + LOGP(DGPRS, LOGL_DEBUG, + "Checking for inactive LLMEs, time = %u\n", (unsigned)now); + + llist_for_each_entry_safe(llme, llme_tmp, &gprs_llc_llmes, list) { + if (llme->age_timestamp == GPRS_LLME_RESET_AGE) + llme->age_timestamp = now; + + age = now - llme->age_timestamp; + + if (age > max_age || age < 0) { + LOGP(DGPRS, LOGL_INFO, + "Inactivity timeout for TLLI 0x%08x, age %d\n", + llme->tlli, (int)age); + sgsn_llme_cleanup_free(llme); + } + } + + osmo_timer_schedule(&sgsn->llme_timer, GPRS_LLME_CHECK_TICK, 0); +} + +static int sgsn_instance_talloc_destructor(struct sgsn_instance *sgi) +{ + sgsn_cdr_release(sgi); + osmo_timer_del(&sgi->llme_timer); + rate_ctr_group_free(sgi->rate_ctrs); + return 0; +} + +struct sgsn_instance *sgsn_instance_alloc(void *talloc_ctx) +{ + struct sgsn_instance *inst; + inst = talloc_zero(talloc_ctx, struct sgsn_instance); + + talloc_set_destructor(inst, sgsn_instance_talloc_destructor); + + inst->cfg.gtp_statedir = talloc_strdup(inst, "./"); + inst->cfg.auth_policy = SGSN_AUTH_POLICY_CLOSED; + inst->cfg.require_authentication = true; /* only applies if auth_policy is REMOTE */ + inst->cfg.gsup_server_port = OSMO_GSUP_PORT; + + inst->cfg.T_defs = sgsn_T_defs; + osmo_tdefs_reset(inst->cfg.T_defs); + inst->cfg.T_defs_gtp = gtp_T_defs; + osmo_tdefs_reset(inst->cfg.T_defs_gtp); + + inst->rate_ctrs = rate_ctr_group_alloc(inst, &sgsn_ctrg_desc, 0); + OSMO_ASSERT(inst->rate_ctrs); + + INIT_LLIST_HEAD(&inst->apn_list); + INIT_LLIST_HEAD(&inst->ggsn_list); + INIT_LLIST_HEAD(&inst->mme_list); + INIT_LLIST_HEAD(&inst->pdp_list); + + osmo_timer_setup(&inst->llme_timer, sgsn_llme_check_cb, NULL); + osmo_timer_schedule(&inst->llme_timer, GPRS_LLME_CHECK_TICK, 0); + /* These are mostly setting up stuff not related to VTY cfg, so they can be set up here: */ + sgsn_auth_init(inst); + sgsn_cdr_init(inst); + return inst; +} + +/* To be called after VTY config parsing: */ +int sgsn_inst_init(struct sgsn_instance *sgsn) +{ + int rc; + + /* start control interface after reading config for + * ctrl_vty_get_bind_addr() */ + sgsn->ctrlh = ctrl_interface_setup(NULL, OSMO_CTRL_PORT_SGSN, NULL); + if (!sgsn->ctrlh) { + LOGP(DGPRS, LOGL_ERROR, "Failed to create CTRL interface.\n"); + return -EIO; + } + + rc = sgsn_ctrl_cmds_install(); + if (rc != 0) { + LOGP(DGPRS, LOGL_ERROR, "Failed to install CTRL commands.\n"); + return -EFAULT; + } + + rc = gprs_subscr_init(sgsn); + if (rc < 0) { + LOGP(DGPRS, LOGL_FATAL, "Cannot set up SGSN\n"); + return rc; + } + return 0; +} diff --git a/src/sgsn/sgsn_auth.c b/src/sgsn/sgsn_auth.c index b8d8035..cbff6f8 100644 --- a/src/sgsn/sgsn_auth.c +++ b/src/sgsn/sgsn_auth.c @@ -22,7 +22,7 @@ #include <osmocom/gsm/protocol/gsm_04_08_gprs.h> #include <osmocom/core/utils.h> #include <osmocom/sgsn/sgsn.h> -#include <osmocom/sgsn/gprs_sgsn.h> +#include <osmocom/sgsn/mmctx.h> #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/gprs_subscriber.h> #include <osmocom/sgsn/debug.h> diff --git a/src/sgsn/sgsn_cdr.c b/src/sgsn/sgsn_cdr.c index 1f7ce5e..89865bf 100644 --- a/src/sgsn/sgsn_cdr.c +++ b/src/sgsn/sgsn_cdr.c @@ -29,6 +29,7 @@ #include <osmocom/sgsn/vty.h> #include <osmocom/sgsn/gtp_ggsn.h> #include <osmocom/sgsn/pdpctx.h> +#include <osmocom/sgsn/mmctx.h> #include <gtp.h> #include <pdp.h> diff --git a/src/sgsn/sgsn_ctrl.c b/src/sgsn/sgsn_ctrl.c index 2ba06ba..add9d9d 100644 --- a/src/sgsn/sgsn_ctrl.c +++ b/src/sgsn/sgsn_ctrl.c @@ -21,7 +21,7 @@ #include <osmocom/ctrl/control_if.h> #include <osmocom/ctrl/control_cmd.h> -#include <osmocom/sgsn/gprs_sgsn.h> +#include <osmocom/sgsn/mmctx.h> #include <osmocom/sgsn/pdpctx.h> #include <osmocom/sgsn/sgsn.h> #include <osmocom/sgsn/debug.h> diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index 9129e39..0a593c5 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -47,7 +47,7 @@ #include <osmocom/sgsn/sgsn.h> #include <osmocom/sgsn/gprs_ns.h> #include <osmocom/sgsn/gprs_llc.h> -#include <osmocom/sgsn/gprs_sgsn.h> +#include <osmocom/sgsn/mmctx.h> #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/gprs_sm.h> #include <osmocom/sgsn/gprs_subscriber.h> diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 72066de..fca85a2 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -38,7 +38,7 @@ #include <osmocom/sgsn/gprs_ns.h> #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/gprs_bssgp.h> -#include <osmocom/sgsn/gprs_sgsn.h> +#include <osmocom/sgsn/mmctx.h> #include <osmocom/sgsn/gtp_ggsn.h> #include <osmocom/sgsn/gtp_mme.h> #include <osmocom/sgsn/vty.h> diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index 8df1395..d22a8d9 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -57,10 +57,11 @@ $(top_builddir)/src/sgsn/gprs_gmm.o \ $(top_builddir)/src/sgsn/gprs_gmm_fsm.o \ $(top_builddir)/src/sgsn/gprs_mm_state_gb_fsm.o \ - $(top_builddir)/src/sgsn/gprs_sgsn.o \ $(top_builddir)/src/sgsn/gtp_ggsn.o \ $(top_builddir)/src/sgsn/gtp_mme.o \ + $(top_builddir)/src/sgsn/mmctx.o \ $(top_builddir)/src/sgsn/pdpctx.o \ + $(top_builddir)/src/sgsn/sgsn.o \ $(top_builddir)/src/sgsn/sgsn_cdr.o \ $(top_builddir)/src/sgsn/sgsn_ctrl.o \ $(top_builddir)/src/sgsn/sgsn_vty.o \ diff --git a/tests/sgsn/gprs_gb_parse.c b/tests/sgsn/gprs_gb_parse.c index 3338911..670839f 100644 --- a/tests/sgsn/gprs_gb_parse.c +++ b/tests/sgsn/gprs_gb_parse.c @@ -18,6 +18,8 @@ * */ +#include <arpa/inet.h> + #include <osmocom/gsm/gsm48.h> #include <osmocom/gsm/protocol/gsm_04_08_gprs.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I048a082851c1275c959649942904205b02acce2a Gerrit-Change-Number: 30904 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-sgsn[master]: Rename bscconfig.h -> config.h

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30902 to look at the new patch set (#2). Change subject: Rename bscconfig.h -> config.h ...................................................................... Rename bscconfig.h -> config.h Change-Id: I007103be34c1aaab7a9375c44b226d4590fe5b24 --- M .gitignore M configure.ac M include/osmocom/sgsn/sgsn.h M src/gtphub/gtphub_main.c M src/sgsn/gprs_gmm.c M src/sgsn/gprs_ns.c M src/sgsn/gprs_ranap.c M src/sgsn/gprs_sgsn.c M src/sgsn/gprs_sm.c M src/sgsn/sgsn_libgtp.c M src/sgsn/sgsn_main.c M src/sgsn/sgsn_vty.c 12 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/02/30902/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I007103be34c1aaab7a9375c44b226d4590fe5b24 Gerrit-Change-Number: 30902 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 5 months

1
0
0 0

Change in osmo-sgsn[master]: Rename bscconfig.h -> config.h

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30902 ) Change subject: Rename bscconfig.h -> config.h ...................................................................... Rename bscconfig.h -> config.h Change-Id: I007103be34c1aaab7a9375c44b226d4590fe5b24 --- M configure.ac M include/osmocom/sgsn/sgsn.h M src/gtphub/gtphub_main.c M src/sgsn/gprs_gmm.c M src/sgsn/gprs_ns.c M src/sgsn/gprs_ranap.c M src/sgsn/gprs_sgsn.c M src/sgsn/gprs_sm.c M src/sgsn/sgsn_libgtp.c M src/sgsn/sgsn_main.c M src/sgsn/sgsn_vty.c 11 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/02/30902/1 diff --git a/configure.ac b/configure.ac index 2c335d7..5985cf8 100644 --- a/configure.ac +++ b/configure.ac @@ -230,7 +230,7 @@ AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) dnl Generate the output -AM_CONFIG_HEADER(bscconfig.h) +AM_CONFIG_HEADER(config.h) AC_OUTPUT( include/Makefile diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index c92b251..aadb8a7 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -14,7 +14,7 @@ #include <osmocom/gsupclient/gsup_client.h> #include <osmocom/sgsn/common.h> -#include "../../bscconfig.h" +#include "../../config.h" #if BUILD_IU #include <osmocom/ranap/iu_client.h> diff --git a/src/gtphub/gtphub_main.c b/src/gtphub/gtphub_main.c index 0f389ab..4d1e9cf 100644 --- a/src/gtphub/gtphub_main.c +++ b/src/gtphub/gtphub_main.c @@ -44,7 +44,7 @@ #include <osmocom/gtphub/gtphub.h> #include <osmocom/sgsn/vty.h> -#include "../../bscconfig.h" +#include "../../config.h" #if BUILD_IU #include <osmocom/sigtran/osmo_ss7.h> diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index 3b805ee..35f28ec 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -30,7 +30,7 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include "bscconfig.h" +#include "config.h" #include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> diff --git a/src/sgsn/gprs_ns.c b/src/sgsn/gprs_ns.c index b676917..e2ff931 100644 --- a/src/sgsn/gprs_ns.c +++ b/src/sgsn/gprs_ns.c @@ -29,7 +29,7 @@ #include <osmocom/gprs/gprs_bssgp_bss.h> #include <osmocom/sgsn/gprs_llc.h> -#include "bscconfig.h" +#include "config.h" #include <osmocom/sgsn/gprs_sgsn.h> #include <osmocom/sgsn/debug.h> diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c index 245de4b..d3d958d 100644 --- a/src/sgsn/gprs_ranap.c +++ b/src/sgsn/gprs_ranap.c @@ -21,7 +21,7 @@ * */ -#include "bscconfig.h" +#include "config.h" #include <gtp.h> #include <osmocom/core/rate_ctr.h> diff --git a/src/sgsn/gprs_sgsn.c b/src/sgsn/gprs_sgsn.c index 6089760..884da76 100644 --- a/src/sgsn/gprs_sgsn.c +++ b/src/sgsn/gprs_sgsn.c @@ -58,7 +58,7 @@ #include <time.h> -#include "../../bscconfig.h" +#include "../../config.h" #define GPRS_LLME_CHECK_TICK 30 diff --git a/src/sgsn/gprs_sm.c b/src/sgsn/gprs_sm.c index c53fe53..1d1923d 100644 --- a/src/sgsn/gprs_sm.c +++ b/src/sgsn/gprs_sm.c @@ -26,7 +26,7 @@ #include <arpa/inet.h> #include <netdb.h> -#include "bscconfig.h" +#include "config.h" #include <osmocom/core/rate_ctr.h> #include <osmocom/core/tdef.h> diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index c6eff34..9129e39 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -34,7 +34,7 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include "bscconfig.h" +#include "config.h" #include <osmocom/core/talloc.h> #include <osmocom/core/select.h> diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index 7253348..d9d454c 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -70,7 +70,7 @@ #include <gtp.h> #include <osmocom/sgsn/sgsn_rim.h> -#include "../../bscconfig.h" +#include "../../config.h" #if BUILD_IU #include <osmocom/sigtran/osmo_ss7.h> diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 959f35b..72066de 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -58,7 +58,7 @@ #include <pdp.h> #include <gtp.h> -#include "../../bscconfig.h" +#include "../../config.h" #ifdef BUILD_IU #include <osmocom/ranap/iu_client.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I007103be34c1aaab7a9375c44b226d4590fe5b24 Gerrit-Change-Number: 30902 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-sgsn[master]: Move LOGGSUBSCRP to gprs_subscriber.h

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30901 ) Change subject: Move LOGGSUBSCRP to gprs_subscriber.h ...................................................................... Move LOGGSUBSCRP to gprs_subscriber.h The define belongs to gprs_subscriber.h header. Change-Id: Icdb7e55ca8e90dd2ba79ccdb1a8ba650a3942ab3 --- M include/osmocom/sgsn/gprs_sgsn.h M include/osmocom/sgsn/gprs_subscriber.h 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/01/30901/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 424e16f..c9e301d 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -306,11 +306,6 @@ #define SGSN_ERROR_CAUSE_NONE (-1) -#define LOGGSUBSCRP(level, subscr, fmt, args...) \ - LOGP(DGPRS, level, "SUBSCR(%s) " fmt, \ - (subscr) ? (subscr)->imsi : "---", \ - ## args) - struct sgsn_config; struct sgsn_instance; extern const struct value_string *sgsn_auth_state_names; diff --git a/include/osmocom/sgsn/gprs_subscriber.h b/include/osmocom/sgsn/gprs_subscriber.h index d84a5d6..78de64a 100644 --- a/include/osmocom/sgsn/gprs_subscriber.h +++ b/include/osmocom/sgsn/gprs_subscriber.h @@ -99,3 +99,8 @@ void gprs_subscr_update(struct gprs_subscr *subscr); void gprs_subscr_update_auth_info(struct gprs_subscr *subscr); int gprs_subscr_rx_gsup_message(struct msgb *msg); + +#define LOGGSUBSCRP(level, subscr, fmt, args...) \ + LOGP(DGPRS, level, "SUBSCR(%s) " fmt, \ + (subscr) ? (subscr)->imsi : "---", \ + ## args) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Icdb7e55ca8e90dd2ba79ccdb1a8ba650a3942ab3 Gerrit-Change-Number: 30901 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-sgsn[master]: Move sgsn_ctrl_cmds_install() declaration to sgsn.h

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30900 ) Change subject: Move sgsn_ctrl_cmds_install() declaration to sgsn.h ...................................................................... Move sgsn_ctrl_cmds_install() declaration to sgsn.h sgsn.h is the main header containing all misc app related contents. This is another step towards shrinking gprs_sgsn.h mess. Change-Id: I80e3a68e2e368d8c73135c850e4728bdf6cf5f09 --- M include/osmocom/sgsn/gprs_sgsn.h M include/osmocom/sgsn/sgsn.h 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/00/30900/1 diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index 3fdf45d..424e16f 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -297,11 +297,6 @@ uint32_t sgsn_alloc_ptmsi(void); /* - * ctrl interface related work - */ -int sgsn_ctrl_cmds_install(void); - -/* * Authorization/ACL handling */ struct imsi_acl_entry { diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index a2cfa9c..c92b251 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -162,6 +162,11 @@ extern struct sgsn_instance *sgsn; extern void *tall_sgsn_ctx; +/* + * ctrl interface related work (sgsn_ctrl.c) + */ +int sgsn_ctrl_cmds_install(void); + /* sgsn_vty.c */ int sgsn_vty_init(struct sgsn_config *cfg); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I80e3a68e2e368d8c73135c850e4728bdf6cf5f09 Gerrit-Change-Number: 30900 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023