February 2024 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: PGW_Tests: refactor/improve several parameters to accomodate for diff...

by pespin

Attention is currently required from: laforge, lynxis lazus, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36074?usp=email ) Change subject: PGW_Tests: refactor/improve several parameters to accomodate for different GTPv2C interfaces ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I know this patch is mixing several minor changes and improvements. But splitting them would take some time and I don't think it's really worth it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36074?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I22b3e18d02ca828e2ea43bde2e0a602db236cf50 Gerrit-Change-Number: 36074 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 23 Feb 2024 16:51:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: WIP

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36075?usp=email ) Change subject: WIP ...................................................................... WIP Change-Id: I38e469edf0e00feca5a648035b64645e2c905937 --- M pgw/PGW_Tests.ttcn 1 file changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/36075/1 diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index bd32760..489abdd 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -686,6 +686,18 @@ } +/* create a session on the PGW on a S2b interface (from ePDG)*/ +private function f_s2b_create_session() runs on PGW_Session_CT { + var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; + + fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S2b_ePDG_GTPC, g_pars.teic_local, 0, + f_inet_addr(mp_local_hostname_c), omit); + fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S2bU_ePDG_GTPU, g_pars.bearer.teid_local, 5, + f_inet_addr(mp_local_hostname_u), omit); + f_create_session(fteid_c_ie, fteid_u_ie); + +} + /* delete the session from the PGW */ private function f_delete_session(template (omit) GTP2C_Cause tx_cause := omit, template (present) OCT4 exp_teid, @@ -934,6 +946,22 @@ vc_conn.done; } +/* create a session, expect it to succeed */ +private function f_TC_s2b_createSession() runs on PGW_Session_CT { + f_s2b_create_session(); + setverdict(pass); +} +testcase TC_s2b_createSession() runs on PGW_Test_CT { + var PGW_Session_CT vc_conn; + var SessionPars pars := valueof(t_SessionPars('001010123456789'H, + "tun22", + msisdn := omit, + rat_type := 3)); + f_init(); + vc_conn := f_start_handler(refers(f_TC_s2b_createSession), pars); + vc_conn.done; +} + control { execute( TC_tx_echo() ); execute( TC_createSession() ); @@ -942,6 +970,7 @@ execute( TC_createSession_deleteSession() ); execute( TC_deleteSession_unknown() ); execute( TC_gy_charging_cc_time() ); + execute( TC_s2b_createSession() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36075?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I38e469edf0e00feca5a648035b64645e2c905937 Gerrit-Change-Number: 36075 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: PGW_Tests: refactor/improve several parameters to accomodate for diff...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36074?usp=email ) Change subject: PGW_Tests: refactor/improve several parameters to accomodate for different GTPv2C interfaces ...................................................................... PGW_Tests: refactor/improve several parameters to accomodate for different GTPv2C interfaces So far we were only testing s5/s8 interface, but we'll want to test s2b soon. This commit is a mixture of refactorings and code improvements as a step towards testing S2b interface. Change-Id: I22b3e18d02ca828e2ea43bde2e0a602db236cf50 --- M library/GTPv2_Templates.ttcn M pgw/PGW_Tests.ttcn 2 files changed, 94 insertions(+), 52 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/36074/1 diff --git a/library/GTPv2_Templates.ttcn b/library/GTPv2_Templates.ttcn index 8df234a..431415a 100644 --- a/library/GTPv2_Templates.ttcn +++ b/library/GTPv2_Templates.ttcn @@ -887,13 +887,14 @@ template (value) octetstring apn, template (value) BIT3 pdn_type, template (omit) FullyQualifiedTEID_List teid_list, template (value) OCT2 chg_car, template (value) uint4_t bearer_id, + template (omit) UserLocationInfo uli := omit, template (value) Bearer_QoS qos := ts_GTP2C_BearerQos('09'O, 0,0,0,0)) := ts_PDU_GTP2C('00000000'O, '000000'O, '20'O, { createSessionRequest := { iMSI := ts_GTP2C_Imsi(imsi), mSISDN := fs_GTP2C_msisdn(msisdn), mEI := omit, - userLocationInfo := omit, + userLocationInfo := uli, servingNetwork := omit, rAT_Type := ts_GTP2C_RatType(rat_type), indication := omit, diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 81fea12..bd32760 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -98,14 +98,6 @@ port DIAMETER_Conn_PT Gx; port DIAMETER_Conn_PT Gy; - /* TEI (Data) local side */ - var OCT4 g_teid; - /* TEI (Control) local side */ - var OCT4 g_teic; - /* TEI (Data) remote side */ - var OCT4 g_teid_remote; - /* TEI (Control) remote side */ - var OCT4 g_teic_remote; /* GTP-U IPv4 address remote sie */ var OCT4 g_gtpu4_remote; var OCT16 g_gtpu6_remote; @@ -122,6 +114,15 @@ var integer g_start_prog_count := 0; } +type record BearerConfig { + /* EPS Bearer ID */ + uint4_t ebi optional, + /* TEI (Data) local side */ + OCT4 teid_local optional, + /* TEI (Data) remote side */ + OCT4 teid_remote optional +}; + /* configuration data for a given Session */ type record SessionPars { hexstring imsi, @@ -138,7 +139,13 @@ /* APN-AMBR */ octetstring pco optional, octetstring epco optional, + + /* TEI (Control) local side */ + OCT4 teic_local, + /* TEI (Control) remote side */ + OCT4 teic_remote optional, /* Bearer Contexts to be created */ + BearerConfig bearer optional, charstring tun_dev_name, charstring tun_netns_name optional, @@ -148,24 +155,28 @@ } template (value) SessionPars -t_SessionPars(hexstring imsi, charstring tundev, integer rat_type := 6, charstring apn := "internet", +t_SessionPars(hexstring imsi, charstring tundev, template (omit) hexstring msisdn := '1234'H, integer rat_type := 6, charstring apn := "internet", boolean selection_mode := false, BIT3 pdn_type := '001'B) := { imsi := imsi, - msisdn := '1234'H, + msisdn := msisdn, rat_type := rat_type, apn := apn, selection_mode := selection_mode, pdn_type := pdn_type, pco := omit, epco := omit, + teic_local := '00000000'O, + teic_remote := omit, + bearer := { + ebi := 5, + teid_local := omit, + teid_remote := omit + }, tun_dev_name := tundev, tun_netns_name := tundev, gy_validity_time := 0 } -type record BearerConfig { - integer eps_bearer_id -} type function void_fn() runs on PGW_Session_CT; @@ -292,6 +303,9 @@ private function f_handler_init(void_fn fn, SessionPars pars) runs on PGW_Session_CT { g_pars := valueof(pars); + /* allocate + register TEID-C on local side */ + g_pars.teic_local := f_gtp2_allocate_teid(); + g_pars.bearer.teid_local := g_pars.teic_local; fn.apply(); } @@ -346,8 +360,8 @@ imsi := char2oct(f_dec_TBCD(imsi_hex2oct(g_pars.imsi))); //msisdn := char2oct(f_dec_TBCD(substr(ctx_val.msisdn, 1, lengthof(ctx_val.msisdn) -1))); rat_type := int2oct(g_pars.rat_type, 1); - charging_char := char2oct(oct2str('0000'O)); // f_create_session() uses hardcoded chg_car := '0000'O - nsapi := '01'O; // f_create_session() uses hardcoded bearer_id := 1 + charging_char := char2oct(oct2str('0000'O)); // f_s5s8_create_session() uses hardcoded chg_car := '0000'O + nsapi := int2oct(g_pars.bearer.ebi, 1); select (req_type) { case (INITIAL_REQUEST) { tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, @@ -550,7 +564,7 @@ /* find F-TEID of the P-GW U side */ var FullyQualifiedTEID rx_fteid; rx_fteid := valueof(f_find_teid(bctx.bearerContextIEs.fullyQualifiedTEID, 5, '0010'B)); - g_teid_remote := rx_fteid.tEID_GRE_Key; + g_pars.bearer.teid_remote := rx_fteid.tEID_GRE_Key; if (rx_fteid.v4_Flag == '1'B) { g_gtpu4_remote := rx_fteid.iPv4_Address; } @@ -559,8 +573,8 @@ } var UECUPS_CreateTun uecups_create := { - tx_teid := oct2int(g_teid_remote), - rx_teid := oct2int(g_teid), + tx_teid := oct2int(g_pars.bearer.teid_remote), + rx_teid := oct2int(g_pars.bearer.teid_local), user_addr_type := IPV4, user_addr := '00000000'O, local_gtp_ep := valueof(ts_UECUPS_SockAddr(f_inet_addr(mp_local_hostname_u))), @@ -582,28 +596,22 @@ } /* create a session on the PGW */ -private function f_create_session() runs on PGW_Session_CT { +private function f_create_session(template (value) FullyQualifiedTEID fteid_c_ie, + template (value) FullyQualifiedTEID fteid_u_ie, + template (omit) UserLocationInfo uli_ie := omit) runs on PGW_Session_CT { var PDU_GTPCv2 rx; - /* allocate + register TEID-C on local side */ - g_teic := f_gtp2_allocate_teid(); - g_teid := g_teic; - - var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; - fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPC, g_teic, 0, - f_inet_addr(mp_local_hostname_c), omit); - fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPU, g_teid, 2, - f_inet_addr(mp_local_hostname_u), omit); var template (value) PDU_GTPCv2 g2c := - ts_GTP2C_CreateSessionReq(imsi := g_pars.imsi, msisdn := g_pars.msisdn, rat_type := 6, + ts_GTP2C_CreateSessionReq(imsi := g_pars.imsi, + msisdn := g_pars.msisdn, + rat_type := g_pars.rat_type, sender_fteid := fteid_c_ie, apn := f_enc_dns_hostname(g_pars.apn), - pdn_type := g_pars.pdn_type, teid_list := { fteid_u_ie }, - chg_car := '0000'O, bearer_id := 1); - /* open5gs up to 1.2.3 won't accept it without ULI, despite not mandatory */ - var template (value) TAI tai := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0001'O }; - var template (value) ECGI ecgi := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0'H, 23 }; - g2c.gtpcv2_pdu.createSessionRequest.userLocationInfo := ts_GTP2C_UserLocInfo(tai := tai, ecgi := ecgi); + pdn_type := g_pars.pdn_type, + teid_list := { fteid_u_ie }, + chg_car := '0000'O, + bearer_id := g_pars.bearer.ebi, + uli := uli_ie); g2c.gtpcv2_pdu.createSessionRequest.servingNetwork := ts_GTP2C_ServingNetwork('001'H, '01F'H); GTP2.send(g2c); @@ -614,10 +622,10 @@ as_DIA_Gy_CCR(INITIAL_REQUEST); } alt { - [] GTP2.receive(tr_GTP2C_CreateSessionResp(d_teid:=g_teic, cause:=Request_accepted)) -> value rx { + [] GTP2.receive(tr_GTP2C_CreateSessionResp(d_teid:=g_pars.teic_local, cause:=Request_accepted)) -> value rx { /* extract TEIDs */ var CreateSessionResponse resp := rx.gtpcv2_pdu.createSessionResponse; - g_teic_remote := resp.fullyQualifiedTEID[0].tEID_GRE_Key; + g_pars.teic_remote := resp.fullyQualifiedTEID[0].tEID_GRE_Key; /* extract allocated address[es] */ var PDN_Address_and_Prefix paa := resp.pDN_AddressAllocation.pDN_Address_and_Prefix; @@ -645,7 +653,7 @@ } } } - [] GTP2.receive(tr_GTP2C_CreateSessionResp(d_teid:=g_teic, cause:=?)) -> value rx { + [] GTP2.receive(tr_GTP2C_CreateSessionResp(d_teid:=g_pars.teic_local, cause:=?)) -> value rx { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected CreateSessionResp(cause=", rx.gtpcv2_pdu.createSessionResponse.cause.causeValue, ")")); @@ -658,18 +666,38 @@ } +/* create a session on the PGW on a S5/S8 interface (from SGW )*/ +private function f_s5s8_create_session() runs on PGW_Session_CT { + var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; + var template (value) UserLocationInfo uli_ie; + + fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPC, g_pars.teic_local, 0, + f_inet_addr(mp_local_hostname_c), omit); + fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPU, g_pars.bearer.teid_local, 2, + f_inet_addr(mp_local_hostname_u), omit); + + + /* open5gs up to 1.2.3 won't accept it without ULI, despite not mandatory */ + var template (value) TAI tai := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0001'O }; + var template (value) ECGI ecgi := { '0'H, '0'H, '1'H, 'F'H, '0'H, '1'H, '0'H, 23 }; + uli_ie := ts_GTP2C_UserLocInfo(tai := tai, ecgi := ecgi); + + f_create_session(fteid_c_ie, fteid_u_ie, uli_ie); + +} + /* delete the session from the PGW */ private function f_delete_session(template (omit) GTP2C_Cause tx_cause := omit, template (present) OCT4 exp_teid, template (present) GTP2C_Cause exp_cause, boolean expect_diameter := true) runs on PGW_Session_CT { var template (value) FullyQualifiedTEID fteid_c_ie - fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPC, g_teic, 0, + fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPC, g_pars.teic_local, 0, f_inet_addr(mp_local_hostname_c), omit); var template PDU_GTPCv2 g2c := - ts_GTP2C_DeleteSessionReq(d_teid := g_teic_remote, cause := tx_cause, + ts_GTP2C_DeleteSessionReq(d_teid := g_pars.teic_remote, cause := tx_cause, sender_fteid := fteid_c_ie, - teid_list := {}, bearer_id := 1); + teid_list := {}, bearer_id := g_pars.bearer.ebi); GTP2.send(g2c); if (Gx.checkstate("Connected") and expect_diameter) { @@ -693,10 +721,10 @@ } /* destroy tunnel in daemon */ - if (isbound(g_teid)) { + if (isbound(g_pars.bearer.teid_local)) { var UECUPS_DestroyTun uecups_destroy := { local_gtp_ep := valueof(ts_UECUPS_SockAddr(f_inet_addr(mp_local_hostname_u))), - rx_teid := oct2int(g_teid) + rx_teid := oct2int(g_pars.bearer.teid_local) }; /* FIXME: what about IPv4/IPv6 differentiation? */ f_gtp2_destroy_tunnel(uecups_destroy); @@ -803,7 +831,7 @@ /* create a session, expect it to succeed */ private function f_TC_createSession() runs on PGW_Session_CT { - f_create_session(); + f_s5s8_create_session(); setverdict(pass); } testcase TC_createSession() runs on PGW_Test_CT { @@ -816,7 +844,7 @@ /* create a session, then execute a ping command on the user plane */ private function f_TC_createSession_ping4() runs on PGW_Session_CT { - f_create_session(); + f_s5s8_create_session(); f_ping4(mp_ping_hostname); setverdict(pass); } @@ -847,8 +875,8 @@ /* create a session, then delete it again */ private function f_TC_createSession_deleteSession() runs on PGW_Session_CT { - f_create_session(); - f_delete_session(omit, g_teic, Request_accepted); + f_s5s8_create_session(); + f_delete_session(omit, g_pars.teic_local, Request_accepted); setverdict(pass); } testcase TC_createSession_deleteSession() runs on PGW_Test_CT { @@ -861,8 +889,7 @@ /* send a DeleteSessionReq for an unknown/invalid TEID */ private function f_TC_deleteSession_unknown() runs on PGW_Session_CT { - g_teic := f_gtp2_allocate_teid(); - g_teic_remote := f_rnd_octstring(4); + g_pars.teic_remote := f_rnd_octstring(4); f_delete_session(omit, '00000000'O, Context_Not_Found, false); setverdict(pass); } @@ -878,7 +905,7 @@ private function f_TC_gy_charging_cc_time() runs on PGW_Session_CT { var default d; - f_create_session(); + f_s5s8_create_session(); /* We should receive an update even if no traffic is sent: */ as_DIA_Gy_CCR(UPDATE_REQUEST); @@ -894,7 +921,7 @@ as_DIA_Gy_CCR(UPDATE_REQUEST); f_validate_gy_cc_report(g_rx_gy, VALIDITY_TIME, (3..4), ?, ?); - f_delete_session(omit, g_teic, Request_accepted); + f_delete_session(omit, g_pars.teic_local, Request_accepted); f_validate_gy_cc_report(g_rx_gy, FINAL, (0..1), 0, 0); setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36074?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I22b3e18d02ca828e2ea43bde2e0a602db236cf50 Gerrit-Change-Number: 36074 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[M] Change in osmo-ggsn[master]: Cosmetic: {lib,gtp}/Makefile.am: diff friendly

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36065?usp=email ) Change subject: Cosmetic: {lib,gtp}/Makefile.am: diff friendly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36065?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ib1956794edc6e82cfa6c5419b2609565674d98a4 Gerrit-Change-Number: 36065 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Feb 2024 16:36:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[M] Change in osmo-ggsn[master]: Cosmetic: AM_CFLAGS: make diff friendly

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36064?usp=email ) Change subject: Cosmetic: AM_CFLAGS: make diff friendly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36064?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I3303cd8ba8c8b21ff267608833d9fb4833ffc471 Gerrit-Change-Number: 36064 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Feb 2024 16:36:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-ggsn[master]: Cosmetic: Makefile.am: make SUBDIRS diff friendly

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36063?usp=email ) Change subject: Cosmetic: Makefile.am: make SUBDIRS diff friendly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36063?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I49e1b08e48dc324f313228e8c69679c37aa774f4 Gerrit-Change-Number: 36063 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 23 Feb 2024 16:36:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[L] Change in libosmocore[master]: Import in46_addr from OsmoGGSN

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/36073?usp=email ) Change subject: Import in46_addr from OsmoGGSN ...................................................................... Import in46_addr from OsmoGGSN Import ip_addr and tests from I54c8a4b1d3a02b71d5983badcd923fa39ce7dd84. Apply minor fixes so it passes the linter. I'm in the process of extending the public API of OsmoGGSN's libgtp, so a GSN can be created with either IPv4 or IPv6. The in46_addr code from osmo-ggsn.git provides a good abstraction for that. I've considered making it public in libgtp, but given that it is generic code that could be used outside of libgtp in other Osmocom projects, put it in libosmocore instead. Related: OS#1953, OS#6096 Related: osmo-ggsn I8f4d9d78689909a149683583cfe36bcdc3f7cbc7 Change-Id: I31078f130ec42aeaa5ead1dde82fdd1eb44d992b --- M include/osmocom/core/Makefile.am A include/osmocom/core/in46_addr.h M src/core/Makefile.am A src/core/in46_addr.c M src/core/libosmocore.map M tests/Makefile.am A tests/in46_addr/in46a_test.c A tests/in46_addr/in46a_test.ok A tests/in46_addr/in46a_v6_test.ok M tests/testsuite.at 10 files changed, 969 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/36073/1 diff --git a/include/osmocom/core/Makefile.am b/include/osmocom/core/Makefile.am index 7c29ca1..b60104f 100644 --- a/include/osmocom/core/Makefile.am +++ b/include/osmocom/core/Makefile.am @@ -25,6 +25,7 @@ gsmtap_util.h \ hash.h \ hashtable.h \ + in46_addr.h \ isdnhdlc.h \ it_q.h \ linuxlist.h \ diff --git a/include/osmocom/core/in46_addr.h b/include/osmocom/core/in46_addr.h new file mode 100644 index 0000000..c59f3e3 --- /dev/null +++ b/include/osmocom/core/in46_addr.h @@ -0,0 +1,43 @@ +#pragma once +#include <stdint.h> +#include <netinet/in.h> + +#include <osmocom/gtp/pdp.h> + +/* a simple wrapper around an in6_addr to also contain the length of the address, + * thereby implicitly indicating the address family of the address */ +struct in46_addr { + uint8_t len; + union { + struct in_addr v4; + struct in6_addr v6; + }; +}; + +struct in46_prefix { + struct in46_addr addr; + uint8_t prefixlen; +}; + +extern int in46a_to_af(const struct in46_addr *in); +extern int in46a_to_sas(struct sockaddr_storage *out, const struct in46_addr *in); +extern const char *in46a_ntop(const struct in46_addr *in, char *dst, socklen_t dst_size); +extern const char *in46a_ntoa(const struct in46_addr *in46); +extern const char *in46p_ntoa(const struct in46_prefix *in46p); +extern int in46a_equal(const struct in46_addr *a, const struct in46_addr *b); +extern int in46a_prefix_equal(const struct in46_addr *a, const struct in46_addr *b); +extern int in46a_within_mask(const struct in46_addr *addr, const struct in46_addr *net, size_t prefixlen); +unsigned int in46a_netmasklen(const struct in46_addr *netmask); + +int in46a_to_eua(const struct in46_addr *src, unsigned int size, struct ul66_t *eua); +int in46a_from_eua(const struct ul66_t *eua, struct in46_addr *dst); + +static inline bool in46a_is_v6(const struct in46_addr *addr) +{ + return addr->len == 8 || addr->len == 16; +} + +static inline bool in46a_is_v4(const struct in46_addr *addr) +{ + return addr->len == sizeof(struct in_addr); +} diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 2efebd8..c018683 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -41,6 +41,7 @@ exec.c \ fsm.c \ gsmtap_util.c \ + in46_addr.c \ isdnhdlc.c \ it_q.c \ logging.c \ diff --git a/src/core/in46_addr.c b/src/core/in46_addr.c new file mode 100644 index 0000000..be53067 --- /dev/null +++ b/src/core/in46_addr.c @@ -0,0 +1,377 @@ +/*! \file in46_addr.c + * IPv4/v6 address functions. + * + * Copyright (C) 2017 by Harald Welte <laforge(a)gnumonks.org> + * + * SPDX-License-Identifier: GPL-2.0+ + * + * The contents of this file may be used under the terms of the GNU + * General Public License Version 2, provided that the above copyright + * notice and this permission notice is included in all copies or + * substantial portions of the software. + * + */ + +#include <osmocom/core/utils.h> +#include <osmocom/core/in46_addr.h> + +#include <sys/types.h> +#include <netinet/in.h> +#include <sys/socket.h> +#include <arpa/inet.h> +#include <netdb.h> +#include <stdlib.h> +#include <string.h> + +/*! Return the address family of given \reff in46_addr argument */ +int in46a_to_af(const struct in46_addr *in) +{ + switch (in->len) { + case 4: + return AF_INET; + case 8: + case 16: + return AF_INET6; + default: + OSMO_ASSERT(0); + return -1; + } +} + +/*! Convert \ref in46_addr to sockaddr_storage */ +int in46a_to_sas(struct sockaddr_storage *out, const struct in46_addr *in) +{ + struct sockaddr_in *sin = (struct sockaddr_in *)out; + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)out; + + switch (in->len) { + case 4: + sin->sin_family = AF_INET; + sin->sin_addr = in->v4; + break; + case 16: + sin6->sin6_family = AF_INET6; + sin6->sin6_addr = in->v6; + break; + default: + OSMO_ASSERT(0); + return -1; + } + + return 0; +} + +/*! Convenience wrapper around inet_ntop() for in46_addr. + * \param[in] in the in46_addr to print + * \param[out] dst destination buffer where string representation of the address is stored + * \param[out] dst_size size dst. Usually it should be at least INET6_ADDRSTRLEN. + * \return address of dst on success, NULL on error */ +const char *in46a_ntop(const struct in46_addr *in, char *dst, socklen_t dst_size) +{ + int af; + + if (!in || in->len == 0) { + osmo_strlcpy(dst, "UNDEFINED", dst_size); + return dst; + } + + af = in46a_to_af(in); + if (af < 0) + return NULL; + + return inet_ntop(af, (const void *) &in->v4, dst, dst_size); +} + +/* like inet_ntoa() */ +const char *in46a_ntoa(const struct in46_addr *in46) +{ + static char addrstr_buf[256]; + if (in46a_ntop(in46, addrstr_buf, sizeof(addrstr_buf)) < 0) + return "INVALID"; + else + return addrstr_buf; +} + +const char *in46p_ntoa(const struct in46_prefix *in46p) +{ + static char addrstr_buf[256]; + snprintf(addrstr_buf, sizeof(addrstr_buf), "%s/%u", in46a_ntoa(&in46p->addr), in46p->prefixlen); + return addrstr_buf; +} + +/*! Determine if two in46_addr are equal or not + * \returns 1 in case they are equal; 0 otherwise */ +int in46a_equal(const struct in46_addr *a, const struct in46_addr *b) +{ + if (a->len == b->len && !memcmp(&a->v6, &b->v6, a->len)) + return 1; + else + return 0; +} + +/*! Determine if two in46_addr prefix are equal or not + * The prefix length is determined by the shortest of the prefixes of a and b + * \returns 1 in case the common prefix are equal; 0 otherwise */ +int in46a_prefix_equal(const struct in46_addr *a, const struct in46_addr *b) +{ + unsigned int len; + if (a->len > b->len) + len = b->len; + else + len = a->len; + + if (!memcmp(&a->v6, &b->v6, len)) + return 1; + else + return 0; +} + +/*! Match if IPv6 addr1 + addr2 are within same \a mask */ +static int ipv6_within_mask(const struct in6_addr *addr1, const struct in6_addr *addr2, + const struct in6_addr *mask) +{ + struct in6_addr masked = *addr2; +#if defined(__linux__) + masked.s6_addr32[0] &= mask->s6_addr32[0]; + masked.s6_addr32[1] &= mask->s6_addr32[1]; + masked.s6_addr32[2] &= mask->s6_addr32[2]; + masked.s6_addr32[3] &= mask->s6_addr32[3]; +#else + masked.__u6_addr.__u6_addr32[0] &= mask->__u6_addr.__u6_addr32[0]; + masked.__u6_addr.__u6_addr32[1] &= mask->__u6_addr.__u6_addr32[1]; + masked.__u6_addr.__u6_addr32[2] &= mask->__u6_addr.__u6_addr32[2]; + masked.__u6_addr.__u6_addr32[3] &= mask->__u6_addr.__u6_addr32[3]; +#endif + if (!memcmp(addr1, &masked, sizeof(struct in6_addr))) + return 1; + else + return 0; +} + +/*! Create an IPv6 netmask from the given prefix length */ +static void create_ipv6_netmask(struct in6_addr *netmask, int prefixlen) +{ + uint32_t *p_netmask; + memset(netmask, 0, sizeof(struct in6_addr)); + if (prefixlen < 0) + prefixlen = 0; + else if (128 < prefixlen) + prefixlen = 128; + +#if defined(__linux__) + p_netmask = &netmask->s6_addr32[0]; +#else + p_netmask = &netmask->__u6_addr.__u6_addr32[0]; +#endif + while (32 < prefixlen) { + *p_netmask = 0xffffffff; + p_netmask++; + prefixlen -= 32; + } + if (prefixlen != 0) + *p_netmask = htonl(0xFFFFFFFF << (32 - prefixlen)); +} + +/*! Determine if given \a addr is within given \a net + \a prefixlen + * Builds the netmask from \a net + \a prefixlen and matches it to \a addr + * \returns 1 in case of a match, 0 otherwise */ +int in46a_within_mask(const struct in46_addr *addr, const struct in46_addr *net, size_t prefixlen) +{ + struct in_addr netmask; + struct in6_addr netmask6; + + if (addr->len != net->len) + return 0; + + switch (addr->len) { + case 4: + netmask.s_addr = htonl(0xFFFFFFFF << (32 - prefixlen)); + if ((addr->v4.s_addr & netmask.s_addr) == net->v4.s_addr) + return 1; + else + return 0; + case 16: + create_ipv6_netmask(&netmask6, prefixlen); + return ipv6_within_mask(&addr->v6, &net->v6, &netmask6); + default: + OSMO_ASSERT(0); + return 0; + } +} + +static unsigned int ipv4_netmasklen(const struct in_addr *netmask) +{ + uint32_t bits = netmask->s_addr; + uint8_t *b = (uint8_t *) &bits; + unsigned int i, prefix = 0; + + for (i = 0; i < 4; i++) { + while (b[i] & 0x80) { + prefix++; + b[i] = b[i] << 1; + } + } + return prefix; +} + +static unsigned int ipv6_netmasklen(const struct in6_addr *netmask) +{ + #if defined(__linux__) + #define ADDRFIELD(i) s6_addr32[i] + #else + #define ADDRFIELD(i) __u6_addr.__u6_addr32[i] + #endif + + unsigned int i, j, prefix = 0; + + for (j = 0; j < 4; j++) { + uint32_t bits = netmask->ADDRFIELD(j); + uint8_t *b = (uint8_t *) &bits; + for (i = 0; i < 4; i++) { + while (b[i] & 0x80) { + prefix++; + b[i] = b[i] << 1; + } + } + } + + #undef ADDRFIELD + + return prefix; +} + +/*! Convert netmask to prefix length representation + * \param[in] netmask in46_addr containing a netmask (consecutive list of 1-bit followed by consecutive list of 0-bit) + * \returns prefix length representation of the netmask (count of 1-bit from the start of the netmask) + */ +unsigned int in46a_netmasklen(const struct in46_addr *netmask) +{ + switch (netmask->len) { + case 4: + return ipv4_netmasklen(&netmask->v4); + case 16: + return ipv6_netmasklen(&netmask->v6); + default: + OSMO_ASSERT(0); + return 0; + } +} + +/*! Convert given array of in46_addr to PDP End User Address + * \param[in] src Array containing 1 or 2 in46_addr + * \param[out] eua End User Address structure to fill + * \returns 0 on success; negative on error + * + * In case size is 2, this function expects to find exactly one IPv4 and one + * IPv6 addresses in src. */ +int in46a_to_eua(const struct in46_addr *src, unsigned int size, struct ul66_t *eua) +{ + const struct in46_addr *src_v4, *src_v6; + if (size == 1) { + switch (src->len) { + case 4: + eua->l = 6; + eua->v[0] = PDP_EUA_ORG_IETF; + eua->v[1] = PDP_EUA_TYPE_v4; + memcpy(&eua->v[2], &src->v4, 4); /* Copy a 4 byte address */ + break; + case 8: + case 16: + eua->l = 18; + eua->v[0] = PDP_EUA_ORG_IETF; + eua->v[1] = PDP_EUA_TYPE_v6; + memcpy(&eua->v[2], &src->v6, 16); /* Copy a 16 byte address */ + break; + default: + OSMO_ASSERT(0); + return -1; + } + return 0; + } + + if (src[0].len == src[1].len) + return -1; /* we should have a v4 and a v6 address */ + + src_v4 = (src[0].len == 4) ? &src[0] : &src[1]; + src_v6 = (src[0].len == 4) ? &src[1] : &src[0]; + + eua->l = 22; + eua->v[0] = PDP_EUA_ORG_IETF; + eua->v[1] = PDP_EUA_TYPE_v4v6; + memcpy(&eua->v[2], &src_v4->v4, 4); + memcpy(&eua->v[6], &src_v6->v6, 16); + + return 0; +} + +/*! Convert given PDP End User Address to an array of in46_addr + * \param[in] eua End User Address structure to parse + * \param[out] dst Array containing 2 in46_addr + * \returns number of parsed addresses (1 or 2) on success; negative on error + * + * This function expects to receive an End User Address struct together with an + * array of 2 zeroed in46_addr structs. The in46_addr structs are filled in + * order, hence if the function returns 1 the parsed address will be stored in + * the first struct and the second one will be left intact. If 2 is returned, it + * is guaranteed that one of them is an IPv4 and the other one is an IPv6, but + * the order in which they are presented is not specified and must be + * discovered for instance by checking the len field of each address. + */ +int in46a_from_eua(const struct ul66_t *eua, struct in46_addr *dst) +{ + if (eua->l < 2) + goto default_to_dyn_v4; + + if (eua->v[0] != 0xf1) + return -1; + + switch (eua->v[1]) { + case PDP_EUA_TYPE_v4: + dst->len = 4; + if (eua->l >= 6) + memcpy(&dst->v4, &eua->v[2], 4); /* Copy a 4 byte address */ + else + dst->v4.s_addr = 0; + return 1; + case PDP_EUA_TYPE_v6: + dst->len = 16; + if (eua->l >= 18) + memcpy(&dst->v6, &eua->v[2], 16); /* Copy a 16 byte address */ + else + memset(&dst->v6, 0, 16); + return 1; + case PDP_EUA_TYPE_v4v6: + /* 3GPP TS 29.060, section 7.7.27 */ + switch (eua->l) { + case 2: /* v4 & v6 dynamic */ + dst[0].v4.s_addr = 0; + memset(&dst[1].v6, 0, 16); + break; + case 6: /* v4 static, v6 dynamic */ + memcpy(&dst[0].v4, &eua->v[2], 4); + memset(&dst[1].v6, 0, 16); + break; + case 18: /* v4 dynamic, v6 static */ + dst[0].v4.s_addr = 0; + memcpy(&dst[1].v6, &eua->v[2], 16); + break; + case 22: /* v4 & v6 static */ + memcpy(&dst[0].v4, &eua->v[2], 4); + memcpy(&dst[1].v6, &eua->v[6], 16); + break; + default: + return -1; + } + dst[0].len = 4; + dst[1].len = 16; + return 2; + default: + return -1; + } + +default_to_dyn_v4: + /* assume dynamic IPv4 by default */ + dst->len = 4; + dst->v4.s_addr = 0; + return 1; +} diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index b66e37d..e58e538 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -55,6 +55,17 @@ gsmtap_source_init_fd; gsmtap_source_init_fd2; gsmtap_type_names; +in46a_equal; +in46a_from_eua; +in46a_netmasklen; +in46a_ntoa; +in46a_ntop; +in46a_prefix_equal; +in46a_to_af; +in46a_to_eua; +in46a_to_sas; +in46a_within_mask; +in46p_ntoa; log_add_target; log_category_name; log_check_level; diff --git a/tests/Makefile.am b/tests/Makefile.am index 7c109a1..d450ed4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -59,6 +59,7 @@ osmo_io/osmo_io_test \ soft_uart/soft_uart_test \ rlp/rlp_test \ + in46_addr/in46a_test \ $(NULL) if ENABLE_MSGFILE @@ -505,6 +506,8 @@ soft_uart/soft_uart_test.ok \ rlp/rlp_test.ok \ socket/socket_sctp_test.ok socket/socket_sctp_test.err \ + in46_addr/in46a_test.ok \ + in46_addr/in46a_v6_test.ok \ $(NULL) if ENABLE_LIBSCTP diff --git a/tests/in46_addr/in46a_test.c b/tests/in46_addr/in46a_test.c new file mode 100644 index 0000000..73fdd87 --- /dev/null +++ b/tests/in46_addr/in46a_test.c @@ -0,0 +1,473 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <time.h> + +#include <netinet/in.h> +#include <sys/socket.h> + +#include <osmocom/core/utils.h> +#include <osmocom/core/application.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/bits.h> +#include <osmocom/core/in46_addr.h> + +static struct log_info log_info = {}; + +static const struct in46_addr g_ia4 = { + .len = 4, + .v4.s_addr = 0x0d0c0b0a, +}; + +static void test_in46a_to_af(void) +{ + printf("Testing in46a_to_af() with IPv4 addresses\n"); + + OSMO_ASSERT(in46a_to_af(&g_ia4) == AF_INET); +} + +static void test_in46a_to_sas(void) +{ + struct sockaddr_storage ss; + struct sockaddr_in *sin = (struct sockaddr_in *) &ss; + + printf("Testing in46a_to_sas() with IPv4 addresses\n"); + + memset(&ss, 0, sizeof(ss)); + OSMO_ASSERT(in46a_to_sas(&ss, &g_ia4) == 0); + OSMO_ASSERT(sin->sin_family == AF_INET); + OSMO_ASSERT(sin->sin_addr.s_addr == g_ia4.v4.s_addr); +} + +static void test_in46a_ntop(void) +{ + struct in46_addr ia; + char buf[256]; + const char *res; + + printf("Testing in46a_ntop() with IPv4 addresses\n"); + + res = in46a_ntop(NULL, buf, sizeof(buf)); + OSMO_ASSERT(res && !strcmp(res, "UNDEFINED")); + printf("res = %s\n", res); + + ia.len = 0; + res = in46a_ntop(&ia, buf, sizeof(buf)); + printf("res = %s\n", res); + OSMO_ASSERT(res && !strcmp(res, "UNDEFINED")); + + ia.len = 4; + ia.v4.s_addr = htonl(0x01020304); + res = in46a_ntop(&ia, buf, sizeof(buf)); + OSMO_ASSERT(res && !strcmp(res, "1.2.3.4")); + printf("res = %s\n", res); +} + +static void test_in46p_ntoa(void) +{ + const struct in46_prefix ip46 = { + .prefixlen = 24, + .addr = { + .len = 4, + .v4.s_addr = htonl(0x10203000), + }, + }; + printf("in46p_ntoa() returns %s\n", in46p_ntoa(&ip46)); +} + +static void test_in46a_equal(void) +{ + struct in46_addr b; + + printf("Testing in46a_equal() with IPv4 addresses\n"); + + memset(&b, 0xff, sizeof(b)); + b.len = g_ia4.len; + b.v4.s_addr = g_ia4.v4.s_addr; + OSMO_ASSERT(in46a_equal(&g_ia4, &b)); +} + +static int log_in46a_within_mask(const struct in46_addr *addr, const struct in46_addr *net, + size_t prefixlen) +{ + int rc; + + printf("in46a_within_mask(%s, ", in46a_ntoa(addr)); + printf("%s, %lu) = ", in46a_ntoa(net), prefixlen); + + rc = in46a_within_mask(addr, net, prefixlen); + printf("%d\n", rc); + + return rc; +} + +static void test_in46a_within_mask(void) +{ + struct in46_addr addr, mask; + + printf("Testing in46a_within_mask() with IPv4 addresses\n"); + + addr = g_ia4; + mask = g_ia4; + OSMO_ASSERT(log_in46a_within_mask(&addr, &mask, 32)); + + mask.v4.s_addr = htonl(ntohl(mask.v4.s_addr) & 0xfffffffC); + OSMO_ASSERT(log_in46a_within_mask(&addr, &mask, 30)); + + mask.v4.s_addr = htonl(ntohl(mask.v4.s_addr) & 0xfff80000); + OSMO_ASSERT(log_in46a_within_mask(&addr, &mask, 13)); + + addr.v4.s_addr = htonl(ntohl(addr.v4.s_addr) + 1); + mask = g_ia4; + OSMO_ASSERT(!log_in46a_within_mask(&addr, &mask, 32)); + mask.v4.s_addr = htonl(ntohl(mask.v4.s_addr) & 0xfffffffC); + OSMO_ASSERT(log_in46a_within_mask(&addr, &mask, 30)); +} + +static void test_in46a_to_eua(void) +{ + struct ul66_t eua; + + printf("testing in46a_to_eua() with IPv4 addresses\n"); + +#if 0 /* triggers assert in current implementation */ + const struct in46_addr ia_invalid = { .len = 3, }; + OSMO_ASSERT(in46a_to_eua(&ia_invalid, &eua) < 0); +#endif + + /* IPv4 address */ + OSMO_ASSERT(in46a_to_eua(&g_ia4, 1, &eua) == 0); + OSMO_ASSERT(eua.v[0] == PDP_EUA_ORG_IETF); + OSMO_ASSERT(eua.v[1] == PDP_EUA_TYPE_v4); + OSMO_ASSERT(osmo_load32le(&eua.v[2]) == g_ia4.v4.s_addr); +} + +static void test_in46a_from_eua(void) +{ + struct in46_addr ia[2]; + struct ul66_t eua; + const uint8_t v4_unspec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v4 }; + const uint8_t v4_spec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v4, 1, 2, 3, 4 }; + memset(&eua, 0, sizeof(eua)); + + printf("Testing in46a_from_eua() with IPv4 addresses\n"); + + /* default: v4 unspec */ + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[0].v4.s_addr == 0); + + /* invalid */ + eua.v[0] = 0x23; + eua.v[1] = PDP_EUA_TYPE_v4; + eua.l = 6; + OSMO_ASSERT(in46a_from_eua(&eua, ia) < 0); + + /* invalid */ + eua.v[0] = PDP_EUA_ORG_IETF; + eua.v[1] = 0x23; + eua.l = 6; + OSMO_ASSERT(in46a_from_eua(&eua, ia) < 0); + + /* unspecified V4 */ + memcpy(eua.v, v4_unspec, sizeof(v4_unspec)); + eua.l = sizeof(v4_unspec); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[0].v4.s_addr == 0); + + /* specified V4 */ + memcpy(eua.v, v4_spec, sizeof(v4_spec)); + eua.l = sizeof(v4_spec); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[0].v4.s_addr == htonl(0x01020304)); +} + +static void test_in46a_netmasklen(void) +{ + struct in46_addr netmask; + unsigned int len; + + printf("Testing in46a_netmasklen() with IPv4 addresses\n"); + netmask.len = 4; + + netmask.v4.s_addr = 0xffffffff; + len = in46a_netmasklen(&netmask); + OSMO_ASSERT(len == 32); + + netmask.v4.s_addr = 0x00ffffff; + len = in46a_netmasklen(&netmask); + OSMO_ASSERT(len == 24); + + netmask.v4.s_addr = 0x00f0ffff; + len = in46a_netmasklen(&netmask); + OSMO_ASSERT(len == 20); + + netmask.v4.s_addr = 0x000000fe; + len = in46a_netmasklen(&netmask); + OSMO_ASSERT(len == 7); + + netmask.v4.s_addr = 0x00000000; + len = in46a_netmasklen(&netmask); + OSMO_ASSERT(len == 0); +} + +/* IPv6 specific tests */ + +static const struct in46_addr g_ia6 = { + .len = 16, + .v6.s6_addr = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }, +}; + +static void test_in46a_to_af_v6(void) +{ + struct in46_addr ia; + + printf("Testing in46a_to_af() with IPv6 addresses\n"); + + OSMO_ASSERT(in46a_to_af(&g_ia6) == AF_INET6); + + ia.len = 8; + OSMO_ASSERT(in46a_to_af(&ia) == AF_INET6); +} + +static void test_in46a_to_sas_v6(void) +{ + struct sockaddr_storage ss; + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) &ss; + + printf("Testing in46a_to_sas() with IPv6 addresses\n"); + + memset(&ss, 0, sizeof(ss)); + OSMO_ASSERT(in46a_to_sas(&ss, &g_ia6) == 0); + OSMO_ASSERT(sin6->sin6_family == AF_INET6); + OSMO_ASSERT(!memcmp(&sin6->sin6_addr, &g_ia6.v6, sizeof(sin6->sin6_addr))); +} + +static void test_in46a_ntop_v6(void) +{ + char buf[256]; + const char *res; + + printf("Testing in46a_ntop() with IPv6 addresses\n"); + + res = in46a_ntop(&g_ia6, buf, sizeof(buf)); + OSMO_ASSERT(res && !strcmp(res, "102:304:506:708:90a:b0c:d0e:f10")); + printf("res = %s\n", res); +} + +static void test_in46a_equal_v6(void) +{ + struct in46_addr b; + + printf("Testing in46a_equal() with IPv6 addresses\n"); + + memset(&b, 0xff, sizeof(b)); + b.len = g_ia6.len; + b.v6 = g_ia6.v6; + OSMO_ASSERT(in46a_equal(&g_ia6, &b)); +} + +static void test_in46a_to_eua_v6(void) +{ + const struct in46_addr ia_v6_8 = { + .len = 8, + .v6.s6_addr = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }, + }; + struct ul66_t eua; + + printf("Testing in46a_to_eua() with IPv6 addresses\n"); + + /* IPv6 address */ + OSMO_ASSERT(in46a_to_eua(&g_ia6, 1, &eua) == 0); + OSMO_ASSERT(eua.v[0] == PDP_EUA_ORG_IETF); + OSMO_ASSERT(eua.v[1] == PDP_EUA_TYPE_v6); + OSMO_ASSERT(!memcmp(&eua.v[2], &g_ia6.v6, 16)); + + /* IPv6 address with prefix / length 8 */ + OSMO_ASSERT(in46a_to_eua(&ia_v6_8, 1, &eua) == 0); + OSMO_ASSERT(eua.v[0] == PDP_EUA_ORG_IETF); + OSMO_ASSERT(eua.v[1] == PDP_EUA_TYPE_v6); + OSMO_ASSERT(!memcmp(&eua.v[2], &ia_v6_8.v6, 16)); +} + +static void test_in46a_to_eua_v4v6(void) +{ + const struct in46_addr ia_v4v6[2] = { + { + .len = 16, + .v6.s6_addr = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }, + }, + { + .len = 4, + .v4.s_addr = 0x0d0c0b0a, + } + }; + struct ul66_t eua; + printf("Testing in46a_to_eua() with IPv4v6 addresses\n"); + + /* IPv4 address */ + OSMO_ASSERT(in46a_to_eua(ia_v4v6, 2, &eua) == 0); + OSMO_ASSERT(eua.v[0] == PDP_EUA_ORG_IETF); + OSMO_ASSERT(eua.v[1] == PDP_EUA_TYPE_v4v6); + OSMO_ASSERT(osmo_load32le(&eua.v[2]) == g_ia4.v4.s_addr); + OSMO_ASSERT(!memcmp(&eua.v[6], &g_ia6.v6, 16)); +} + +static void test_in46a_from_eua_v6(void) +{ + struct in46_addr ia[2]; + struct ul66_t eua; + const uint8_t v6_unspec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v6 }; + const uint8_t v6_spec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v6, + 1, 2, 3, 4, 5, 6, 7, 8, + 9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0x10 }; + + memset(&eua, 0, sizeof(eua)); + + printf("Testing in46a_from_eua() with IPv6 addresses\n"); + + /* unspecified V6 */ + memcpy(eua.v, v6_unspec, sizeof(v6_unspec)); + eua.l = sizeof(v6_unspec); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 16); + OSMO_ASSERT(IN6_IS_ADDR_UNSPECIFIED(&ia[0].v6)); + + /* specified V6 */ + memcpy(eua.v, v6_spec, sizeof(v6_spec)); + eua.l = sizeof(v6_spec); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 1); + OSMO_ASSERT(ia[0].len == 16); + OSMO_ASSERT(!memcmp(&ia[0].v6, v6_spec+2, ia[0].len)); +} + +static void test_in46a_from_eua_v4v6(void) +{ + struct in46_addr ia[2]; + struct ul66_t eua; + const uint8_t v4_unspec_v6_unspec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v4v6 }; + const uint8_t v4_spec_v6_unspec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v4v6, + 1, 2, 3, 4 }; + const uint8_t v4_unspec_v6_spec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v4v6, + 1, 2, 3, 4, 5, 6, 7, 8, + 9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0x10 }; + const uint8_t v4_spec_v6_spec[] = { PDP_EUA_ORG_IETF, PDP_EUA_TYPE_v4v6, + 1, 2, 3, 4, + 1, 2, 3, 4, 5, 6, 7, 8, + 9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0x10 }; + + memset(&eua, 0, sizeof(eua)); + + printf("Testing in46a_from_eua() with IPv4v6 addresses\n"); + + /* unspecified V4 & V6 */ + memcpy(eua.v, v4_unspec_v6_unspec, sizeof(v4_unspec_v6_unspec)); + eua.l = sizeof(v4_unspec_v6_unspec); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 2); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[1].len == 16); + OSMO_ASSERT(ia[0].v4.s_addr == 0); + OSMO_ASSERT(IN6_IS_ADDR_UNSPECIFIED(&ia[1].v6)); + + /* specified V4, unspecified V6 */ + memcpy(eua.v, v4_spec_v6_unspec, sizeof(v4_spec_v6_unspec)); + eua.l = sizeof(v4_spec_v6_unspec); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 2); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[1].len == 16); + OSMO_ASSERT(ia[0].v4.s_addr == htonl(0x01020304)); + OSMO_ASSERT(IN6_IS_ADDR_UNSPECIFIED(&ia[1].v6)); + + /* unspecified V4, specified V6 */ + memcpy(eua.v, v4_unspec_v6_spec, sizeof(v4_unspec_v6_spec)); + eua.l = sizeof(v4_unspec_v6_spec); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 2); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[1].len == 16); + OSMO_ASSERT(ia[0].v4.s_addr == 0); + OSMO_ASSERT(!memcmp(&ia[1].v6, v4_unspec_v6_spec+2, ia[1].len)); + + /* specified V4, specified V6 */ + memcpy(eua.v, v4_spec_v6_spec, sizeof(v4_spec_v6_spec)); + eua.l = sizeof(v4_spec_v6_spec); + OSMO_ASSERT(in46a_from_eua(&eua, ia) == 2); + OSMO_ASSERT(ia[0].len == 4); + OSMO_ASSERT(ia[1].len == 16); + OSMO_ASSERT(ia[0].v4.s_addr == htonl(0x01020304)); + OSMO_ASSERT(!memcmp(&ia[1].v6, v4_spec_v6_spec+6, ia[1].len)); +} + +static void test_in46a_netmasklen_v6(void) +{ + unsigned int len; + printf("Testing in46a_netmasklen() with IPv6 addresses\n"); + const struct in46_addr netmaskA = { + .len = 16, + .v6.s6_addr = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, + }; + len = in46a_netmasklen(&netmaskA); + OSMO_ASSERT(len == 128); + + const struct in46_addr netmaskB = { + .len = 16, + .v6.s6_addr = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00}, + }; + len = in46a_netmasklen(&netmaskB); + OSMO_ASSERT(len == 104); + + const struct in46_addr netmaskC = { + .len = 16, + .v6.s6_addr = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00}, + }; + len = in46a_netmasklen(&netmaskC); + OSMO_ASSERT(len == 103); + + const struct in46_addr netmaskD = { + .len = 16, + .v6.s6_addr = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, + }; + len = in46a_netmasklen(&netmaskD); + OSMO_ASSERT(len == 0); +} + +int main(int argc, char **argv) +{ + void *tall_ctx = talloc_named_const(NULL, 1, "Root context"); + msgb_talloc_ctx_init(tall_ctx, 0); + osmo_init_logging2(tall_ctx, &log_info); + log_set_use_color(osmo_stderr_target, 0); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + + srand(time(NULL)); + + if (argc < 2 || strcmp(argv[1], "-v6")) { + test_in46a_to_af(); + test_in46a_to_sas(); + test_in46a_ntop(); + test_in46p_ntoa(); + test_in46a_equal(); + test_in46a_within_mask(); + test_in46a_to_eua(); + test_in46a_from_eua(); + test_in46a_netmasklen(); + } else { + test_in46a_to_af_v6(); + test_in46a_to_sas_v6(); + test_in46a_ntop_v6(); + test_in46a_equal_v6(); + test_in46a_to_eua_v6(); + test_in46a_from_eua_v6(); + test_in46a_to_eua_v4v6(); + test_in46a_from_eua_v4v6(); + test_in46a_netmasklen_v6(); + } + return 0; +} diff --git a/tests/in46_addr/in46a_test.ok b/tests/in46_addr/in46a_test.ok new file mode 100644 index 0000000..b497ad1 --- /dev/null +++ b/tests/in46_addr/in46a_test.ok @@ -0,0 +1,17 @@ +Testing in46a_to_af() with IPv4 addresses +Testing in46a_to_sas() with IPv4 addresses +Testing in46a_ntop() with IPv4 addresses +res = UNDEFINED +res = UNDEFINED +res = 1.2.3.4 +in46p_ntoa() returns 16.32.48.0/24 +Testing in46a_equal() with IPv4 addresses +Testing in46a_within_mask() with IPv4 addresses +in46a_within_mask(10.11.12.13, 10.11.12.13, 32) = 1 +in46a_within_mask(10.11.12.13, 10.11.12.12, 30) = 1 +in46a_within_mask(10.11.12.13, 10.8.0.0, 13) = 1 +in46a_within_mask(10.11.12.14, 10.11.12.13, 32) = 0 +in46a_within_mask(10.11.12.14, 10.11.12.12, 30) = 1 +testing in46a_to_eua() with IPv4 addresses +Testing in46a_from_eua() with IPv4 addresses +Testing in46a_netmasklen() with IPv4 addresses diff --git a/tests/in46_addr/in46a_v6_test.ok b/tests/in46_addr/in46a_v6_test.ok new file mode 100644 index 0000000..10dc7f4 --- /dev/null +++ b/tests/in46_addr/in46a_v6_test.ok @@ -0,0 +1,10 @@ +Testing in46a_to_af() with IPv6 addresses +Testing in46a_to_sas() with IPv6 addresses +Testing in46a_ntop() with IPv6 addresses +res = 102:304:506:708:90a:b0c:d0e:f10 +Testing in46a_equal() with IPv6 addresses +Testing in46a_to_eua() with IPv6 addresses +Testing in46a_from_eua() with IPv6 addresses +Testing in46a_to_eua() with IPv4v6 addresses +Testing in46a_from_eua() with IPv4v6 addresses +Testing in46a_netmasklen() with IPv6 addresses diff --git a/tests/testsuite.at b/tests/testsuite.at index 4a0af0d..ca3e43e 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -541,3 +541,15 @@ cat $abs_srcdir/rlp/rlp_test.ok > expout AT_CHECK([$abs_top_builddir/tests/rlp/rlp_test], [0], [expout], [ignore]) AT_CLEANUP + +AT_SETUP([in46a]) +AT_KEYWORDS([in46a]) +cat $abs_srcdir/in46_addr/in46a_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/in46_addr/in46a_test], [], [expout], []) +AT_CLEANUP + +AT_SETUP([in46a_v6]) +AT_KEYWORDS([in46a_v6]) +cat $abs_srcdir/in46_addr/in46a_v6_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/in46_addr/in46a_test -v6], [], [expout], []) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36073?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I31078f130ec42aeaa5ead1dde82fdd1eb44d992b Gerrit-Change-Number: 36073 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in osmo-ggsn[master]: gsna2in46a: move and rename from in46a_from_gsna

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36069?usp=email ) Change subject: gsna2in46a: move and rename from in46a_from_gsna ...................................................................... gsna2in46a: move and rename from in46a_from_gsna Prepare to move in46a functions to libosmocore. I added this function recently, and it probably isn't useful outside of osmo-ggsn, so rename and move it to be more consistent with similar functions in gtp.c. Change-Id: I54c8a4b1d3a02b71d5983badcd923fa39ce7dd84 --- M ggsn/ggsn_vty.c M gtp/gtp.c M gtp/gtp_internal.h M lib/gtp-kernel.c M lib/in46_addr.c M lib/in46_addr.h 6 files changed, 24 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/69/36069/1 diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c index f70daf1..01d7322 100644 --- a/ggsn/ggsn_vty.c +++ b/ggsn/ggsn_vty.c @@ -815,7 +815,7 @@ { struct in46_addr in46; - in46a_from_gsna(in, &in46); + gsna2in46a(in, &in46); return in46a_ntoa(&in46); } diff --git a/gtp/gtp.c b/gtp/gtp.c index f426e6d..68d8003 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -3108,6 +3108,14 @@ return 0; } +void gsna2in46a(const struct ul16_t *gsna, struct in46_addr *dst) +{ + dst->len = gsna->l; + OSMO_ASSERT(gsna->l <= sizeof(dst->v6)); + memcpy(&dst->v6, gsna->v, gsna->l); +} + + /* TS 29.060 has yet again a different encoding for IMSIs than * what we have in other places, so we cannot use the gsm48 * decoding functions. Also, libgtp uses an uint64_t in diff --git a/gtp/gtp_internal.h b/gtp/gtp_internal.h index 826ea59..7ee47cc 100644 --- a/gtp/gtp_internal.h +++ b/gtp/gtp_internal.h @@ -49,4 +49,5 @@ int ipv42eua(struct ul66_t *eua, struct in_addr *src); int eua2ipv4(struct in_addr *dst, struct ul66_t *eua); int in_addr2gsna(struct ul16_t *gsna, struct in_addr *src); +void gsna2in46a(const struct ul16_t *gsna, struct in46_addr *dst); uint64_t gtp_imsi_str2gtp(const char *str); diff --git a/lib/gtp-kernel.c b/lib/gtp-kernel.c index 9f2ad65..f89097c 100644 --- a/lib/gtp-kernel.c +++ b/lib/gtp-kernel.c @@ -113,7 +113,7 @@ pdp_debug(__func__, devname, pdp); - in46a_from_gsna(&pdp->gsnrc, &sgsn); + gsna2in46a(&pdp->gsnrc, &sgsn); ms_addr_count = in46a_from_eua(&pdp->eua, ms); diff --git a/lib/in46_addr.c b/lib/in46_addr.c index c5157be..f5cdf41 100644 --- a/lib/in46_addr.c +++ b/lib/in46_addr.c @@ -375,10 +375,3 @@ dst->v4.s_addr = 0; return 1; } - -void in46a_from_gsna(const struct ul16_t *in, struct in46_addr *dst) -{ - dst->len = in->l; - OSMO_ASSERT(in->l <= sizeof(dst->v6)); - memcpy(&dst->v6, in->v, in->l); -} diff --git a/lib/in46_addr.h b/lib/in46_addr.h index 89e1e22..c3c9e9c 100644 --- a/lib/in46_addr.h +++ b/lib/in46_addr.h @@ -39,5 +39,3 @@ static inline bool in46a_is_v4(const struct in46_addr *addr) { return addr->len == sizeof(struct in_addr); } - -void in46a_from_gsna(const struct ul16_t *in, struct in46_addr *dst); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36069?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I54c8a4b1d3a02b71d5983badcd923fa39ce7dd84 Gerrit-Change-Number: 36069 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[S] Change in osmo-ggsn[master]: gtp/gsn: gtp_new: replace calloc with talloc_zero

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36071?usp=email ) Change subject: gtp/gsn: gtp_new: replace calloc with talloc_zero ...................................................................... gtp/gsn: gtp_new: replace calloc with talloc_zero Prepare to attach allocate an internal struct in the next patch, that will be attached to *gsn's talloc tree. Change-Id: Ie10dd6f32a42513f6d2b5c7dd0dd84b4f0d20afb --- M gtp/gsn.c 1 file changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/71/36071/1 diff --git a/gtp/gsn.c b/gtp/gsn.c index c23fb2a..8cb1a47 100644 --- a/gtp/gsn.c +++ b/gtp/gsn.c @@ -116,6 +116,12 @@ {} }; +static void *gsn_ctx = NULL; + +static __attribute__((constructor)) void on_dso_load_init_ctx(void) +{ + gsn_ctx = talloc_named_const(NULL, 1, "libgtp gsn.c"); +} /* API Functions */ @@ -466,7 +472,7 @@ { LOGP(DLGTP, LOGL_NOTICE, "GTP: gtp_newgsn() started at %s\n", inet_ntoa(*listen)); - *gsn = calloc(sizeof(struct gsn_t), 1); /* TODO */ + *gsn = talloc_zero(gsn_ctx, struct gsn_t); (*gsn)->statedir = statedir; log_restart(*gsn); @@ -550,7 +556,7 @@ rate_ctr_group_free(gsn->ctrg); - free(gsn); + talloc_free(gsn); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36071?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ie10dd6f32a42513f6d2b5c7dd0dd84b4f0d20afb Gerrit-Change-Number: 36071 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[M] Change in osmo-ggsn[master]: kernel-gtp: support IPv6 on outer layer (backwards compatible)

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/36072?usp=email ) Change subject: kernel-gtp: support IPv6 on outer layer (backwards compatible) ...................................................................... kernel-gtp: support IPv6 on outer layer (backwards compatible) Implement I257fff1dcd9d030a7f9ea936b2693a3f13208230 again, but this time make it backwards compatible. The IPv6 are stored in a new internal struct, and setters and getters are added. Related: OS#1953, OS#6096 Change-Id: I4212d847b6e1ad5ce120451a2d8a5578c48b90fe --- M ggsn/ggsn.c M gtp/gsn.c M gtp/gsn_internal.h M gtp/gtp.c M gtp/gtp_internal.h M include/osmocom/gtp/gsn.h 6 files changed, 169 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/72/36072/1 diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index de3f614..76ed1d2 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -818,7 +818,7 @@ LOGPGGSN(LOGL_INFO, ggsn, "Starting GGSN\n"); /* Start libgtp listener */ - if (gtp_new(&ggsn->gsn, ggsn->cfg.state_dir, &ggsn->cfg.listen_addr.v4, GTP_MODE_GGSN)) { + if (gtp_new2(&ggsn->gsn, ggsn->cfg.state_dir, &ggsn->cfg.listen_addr, GTP_MODE_GGSN)) { LOGPGGSN(LOGL_ERROR, ggsn, "Failed to create GTP: %s\n", strerror(errno)); return -1; } @@ -826,11 +826,10 @@ /* patch in different addresses to use (in case we're behind NAT, the listen * address is different from what we advertise externally) */ - if (ggsn->cfg.gtpc_addr.v4.s_addr) - ggsn->gsn->gsnc = ggsn->cfg.gtpc_addr.v4; - - if (ggsn->cfg.gtpu_addr.v4.s_addr) - ggsn->gsn->gsnu = ggsn->cfg.gtpu_addr.v4; + if (ggsn->cfg.gtpc_addr.len) + gtp_set_gsnc(ggsn->gsn, &ggsn->cfg.gtpc_addr); + if (ggsn->cfg.gtpu_addr.len) + gtp_set_gsnu(ggsn->gsn, &ggsn->cfg.gtpu_addr); /* Register File Descriptors */ osmo_fd_setup(&ggsn->gtp_fd0, ggsn->gsn->fd0, OSMO_FD_READ, ggsn_gtp_fd_cb, ggsn, 0); diff --git a/gtp/gsn.c b/gtp/gsn.c index 8cb1a47..3cdb61e 100644 --- a/gtp/gsn.c +++ b/gtp/gsn.c @@ -431,49 +431,65 @@ talloc_free(filename); } -static int create_and_bind_socket(const char *name, struct gsn_t *gsn, int *fd, int domain, - const struct in_addr *listen, int port) +static int create_and_bind_socket(const char *name, struct gsn_t *gsn, int *fd, const struct in46_addr *listen, + int port) { - struct sockaddr_in addr; + int family = in46a_to_af(listen); int type = SOCK_DGRAM; int protocol = 0; - - *fd = socket(domain, type, protocol); - + struct sockaddr addr = {0}; + struct sockaddr_in *addr4 = (struct sockaddr_in *)&addr; + struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&addr; + *fd = socket(family, type, protocol); if (*fd < 0) { rate_ctr_inc2(gsn->ctrg, GSN_CTR_ERR_SOCKET); LOGP(DLGTP, LOGL_ERROR, "%s socket(domain=%d, type=%d, protocol=%d) failed: Error = %s\n", - name, domain, type, protocol, strerror(errno)); + name, family, type, protocol, strerror(errno)); return -errno; } - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = domain; - addr.sin_addr = *listen; - addr.sin_port = htons(port); + switch (family) { + case AF_INET: + addr4->sin_family = AF_INET; + addr4->sin_addr = listen->v4; + addr4->sin_port = htons(port); #if defined(__FreeBSD__) || defined(__APPLE__) - addr.sin_len = sizeof(addr); + addr4->sin_len = sizeof(struct addr); #endif - - if (bind(*fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + break; + case AF_INET6: + addr6->sin6_family = AF_INET6; + addr6->sin6_addr = listen->v6; + addr6->sin6_port = htons(port); +#if defined(__FreeBSD__) || defined(__APPLE__) + addr6->sin6_len = sizeof(struct addr); +#endif + break; + default: + OSMO_ASSERT(false); + break; + } + if (bind(*fd, &addr, sizeof(addr)) < 0) { rate_ctr_inc2(gsn->ctrg, GSN_CTR_ERR_SOCKET); - LOGP_WITH_ADDR(DLGTP, LOGL_ERROR, addr, - "%s bind(fd=%d) failed: Error = %s\n", - name, *fd, strerror(errno)); + LOGP(DLGTP, LOGL_ERROR, + "%s bind(fd=%d, addr=(%s:%d)) failed: Error = %s\n", + name, *fd, in46a_ntoa(listen), port, strerror(errno)); return -errno; } - return 0; } -int gtp_new(struct gsn_t **gsn, char *statedir, struct in_addr *listen, - int mode) +int gtp_new2(struct gsn_t **gsn, char *statedir, struct in46_addr *listen, int mode) { - LOGP(DLGTP, LOGL_NOTICE, "GTP: gtp_newgsn() started at %s\n", inet_ntoa(*listen)); + struct gsn_internal *internal; + + LOGP(DLGTP, LOGL_NOTICE, "GTP: gtp_newgsn() started at %s\n", in46a_ntoa(listen)); *gsn = talloc_zero(gsn_ctx, struct gsn_t); + internal = talloc_zero(*gsn, struct gsn_internal); + (*gsn)->internal = internal; + (*gsn)->statedir = statedir; log_restart(*gsn); @@ -510,8 +526,8 @@ /* Store function parameters */ /* Same IP for user traffic and signalling */ - (*gsn)->gsnc = *listen; - (*gsn)->gsnu = *listen; + gtp_set_gsnc(*gsn, listen); + gtp_set_gsnu(*gsn, listen); (*gsn)->mode = mode; (*gsn)->fd0 = -1; @@ -519,15 +535,13 @@ (*gsn)->fd1u = -1; /* Create GTP version 0 socket */ - if (create_and_bind_socket("GTPv0", *gsn, &(*gsn)->fd0, AF_INET, listen, GTP0_PORT) < 0) + if (create_and_bind_socket("GTPv0", *gsn, &(*gsn)->fd0, listen, GTP0_PORT) < 0) goto error; - /* Create GTP version 1 control plane socket */ - if (create_and_bind_socket("GTPv1 control plane", *gsn, &(*gsn)->fd1c, AF_INET, listen, GTP1C_PORT) < 0) + if (create_and_bind_socket("GTPv1 control plane", *gsn, &(*gsn)->fd1c, listen, GTP1C_PORT) < 0) goto error; - /* Create GTP version 1 user plane socket */ - if (create_and_bind_socket("GTPv1 user plane", *gsn, &(*gsn)->fd1u, AF_INET, listen, GTP1U_PORT) < 0) + if (create_and_bind_socket("GTPv1 user plane", *gsn, &(*gsn)->fd1u, listen, GTP1U_PORT) < 0) goto error; /* Start internal queue timer */ @@ -540,6 +554,75 @@ return -1; } +/* IPv4 only, use gtp_new2 to support IPv6 too. */ +int gtp_new(struct gsn_t **gsn, char *statedir, struct in_addr *listen, int mode) +{ + struct in46_addr i46a = {0}; + + i46a.len = sizeof(struct in_addr); + i46a.v4 = *listen; + + return gtp_new2(gsn, statedir, &i46a, mode); +} + +void gtp_get_gsnc(const struct gsn_t *gsn, struct in46_addr *dest) +{ + struct gsn_internal *internal = gsn->internal; + + if (internal->gsnc_is_v6) { + dest->len = sizeof(struct in6_addr); + dest->v6 = internal->gsnc6; + } else { + dest->len = sizeof(struct in_addr); + dest->v4 = gsn->gsnc; + } +} + +void gtp_get_gsnu(const struct gsn_t *gsn, struct in46_addr *dest) +{ + struct gsn_internal *internal = gsn->internal; + + if (internal->gsnu_is_v6) { + dest->len = sizeof(struct in6_addr); + dest->v6 = internal->gsnu6; + } else { + dest->len = sizeof(struct in_addr); + dest->v4 = gsn->gsnu; + } +} + +void gtp_set_gsnc(struct gsn_t *gsn, const struct in46_addr *addr) +{ + struct gsn_internal *internal = gsn->internal; + + if (in46a_to_af(addr) == AF_INET6) { + gsn->gsnc = (struct in_addr){0}; + internal->gsnc6 = addr->v6; + internal->gsnc_is_v6 = true; + + } else { + gsn->gsnc = addr->v4; + internal->gsnc6 = (struct in6_addr){0}; + internal->gsnc_is_v6 = false; + } +} + +void gtp_set_gsnu(struct gsn_t *gsn, const struct in46_addr *addr) +{ + struct gsn_internal *internal = gsn->internal; + + if (in46a_to_af(addr) == AF_INET6) { + gsn->gsnu = (struct in_addr){0}; + internal->gsnu6 = addr->v6; + internal->gsnu_is_v6 = true; + + } else { + gsn->gsnu = addr->v4; + internal->gsnu6 = (struct in6_addr){0}; + internal->gsnu_is_v6 = false; + } +} + int gtp_free(struct gsn_t *gsn) { diff --git a/gtp/gsn_internal.h b/gtp/gsn_internal.h index 732cb17..dbf8991 100644 --- a/gtp/gsn_internal.h +++ b/gtp/gsn_internal.h @@ -2,3 +2,13 @@ #include <osmocom/core/in46_addr.h> void gtp_queue_timer_start(struct gsn_t *gsn); + +struct gsn_internal { + /* IP address of this gsn for signalling */ + bool gsnc_is_v6; + struct in6_addr gsnc6; + + /* IP address of this gsn for user traffic */ + bool gsnu_is_v6; + struct in6_addr gsnu6; +}; diff --git a/gtp/gtp.c b/gtp/gtp.c index 68d8003..9708928 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -1083,6 +1083,7 @@ int hlen = get_hlen(pack); uint8_t linked_nsapi = 0; struct pdp_t *linked_pdp = NULL; + struct in46_addr addr; if (!gtp_duplicate(gsn, version, peer, seq)) return 0; @@ -1300,8 +1301,11 @@ } /* Initialize our own IP addresses */ - in_addr2gsna(&pdp->gsnlc, &gsn->gsnc); - in_addr2gsna(&pdp->gsnlu, &gsn->gsnu); + gtp_get_gsnc(gsn, &addr); + in46a2gsna(&pdp->gsnlc, &addr); + + gtp_get_gsnu(gsn, &addr); + in46a2gsna(&pdp->gsnlu, &addr); if (!gtp_pdp_getimsi(gsn, &pdp_old, pdp->imsi, pdp->nsapi)) { /* Found old pdp with same tid. Now the voodoo begins! */ @@ -3115,6 +3119,14 @@ memcpy(&dst->v6, gsna->v, gsna->l); } +void in46a2gsna(struct ul16_t *gsna, const struct in46_addr *src) +{ + memset(gsna, 0, sizeof(struct ul16_t)); + gsna->l = src->len; + OSMO_ASSERT(gsna->l <= sizeof(gsna->v)); + memcpy(gsna->v, &src->v6, gsna->l); +} + /* TS 29.060 has yet again a different encoding for IMSIs than * what we have in other places, so we cannot use the gsm48 diff --git a/gtp/gtp_internal.h b/gtp/gtp_internal.h index 7ee47cc..3e47026 100644 --- a/gtp/gtp_internal.h +++ b/gtp/gtp_internal.h @@ -50,4 +50,5 @@ int eua2ipv4(struct in_addr *dst, struct ul66_t *eua); int in_addr2gsna(struct ul16_t *gsna, struct in_addr *src); void gsna2in46a(const struct ul16_t *gsna, struct in46_addr *dst); +void in46a2gsna(struct ul16_t *gsna, const struct in46_addr *src); uint64_t gtp_imsi_str2gtp(const char *str); diff --git a/include/osmocom/gtp/gsn.h b/include/osmocom/gtp/gsn.h index 936db9b..2db4fd4 100644 --- a/include/osmocom/gtp/gsn.h +++ b/include/osmocom/gtp/gsn.h @@ -17,6 +17,7 @@ #include <osmocom/core/timer.h> #include <osmocom/core/tdef.h> #include <osmocom/core/rate_ctr.h> +#include <osmocom/core/in46_addr.h> #include "pdp.h" @@ -77,6 +78,9 @@ int fd1c; /* GTP1 control plane file descriptor */ int fd1u; /* GTP0 user plane file descriptor */ int mode; /* Mode of operation: GGSN or SGSN */ + + /* If you access gsnc and gsnu directly, only IPv4 is supported. Use + * gtp_new2(), gtp_get_gsnc(), gtp_get_gsnu() to support IPv6 too. */ struct in_addr gsnc; /* IP address of this gsn for signalling */ struct in_addr gsnu; /* IP address of this gsn for user traffic */ @@ -113,12 +117,19 @@ /* Timers: */ struct osmo_tdef *tdef; + + void *internal; }; /* External API functions */ -extern int gtp_new(struct gsn_t **gsn, char *statedir, struct in_addr *listen, - int mode); +extern int gtp_new(struct gsn_t **gsn, char *statedir, struct in_addr *listen, int mode); +extern int gtp_new2(struct gsn_t **gsn, char *statedir, struct in46_addr *listen, int mode); + +extern void gtp_get_gsnc(const struct gsn_t *gsn, struct in46_addr *dest); +extern void gtp_get_gsnu(const struct gsn_t *gsn, struct in46_addr *dest); +extern void gtp_set_gsnu(struct gsn_t *gsn, const struct in46_addr *addr); +extern void gtp_set_gsnc(struct gsn_t *gsn, const struct in46_addr *addr); extern int gtp_free(struct gsn_t *gsn); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/36072?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I4212d847b6e1ad5ce120451a2d8a5578c48b90fe Gerrit-Change-Number: 36072 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024