Change in osmo-upf[master]: cosmetic: in code, rename 'endecaps' to 'tunend'

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/30234 ) Change subject: cosmetic: in code, rename 'endecaps' to 'tunend' ...................................................................... cosmetic: in code, rename 'endecaps' to 'tunend' Change-Id: I55ce7cc842f36b2528e6a1a15d6f3bcb960f492b --- M include/osmocom/upf/up_gtp_action.h M src/osmo-pfcp-tool/pfcp_tool_vty.c M src/osmo-upf/up_gtp_action.c M src/osmo-upf/up_session.c 4 files changed, 18 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/34/30234/1 diff --git a/include/osmocom/upf/up_gtp_action.h b/include/osmocom/upf/up_gtp_action.h index 1907ed1..5b4d5ee 100644 --- a/include/osmocom/upf/up_gtp_action.h +++ b/include/osmocom/upf/up_gtp_action.h @@ -40,7 +40,7 @@ enum up_gtp_action_kind { UP_GTP_DROP, - UP_GTP_U_ENDECAPS, + UP_GTP_U_TUNEND, UP_GTP_U_TUNMAP, }; @@ -54,7 +54,7 @@ enum up_gtp_action_kind kind; union { /* En-/De-capsulate GTP: add/remove a GTP header and forward the GTP payload from/to plain IP. */ - struct upf_gtp_tun_desc endecaps; + struct upf_gtp_tun_desc tunend; /* Tunnel-map GTP: translate from one TEID to another and forward */ struct upf_nft_tunmap_desc tunmap; diff --git a/src/osmo-pfcp-tool/pfcp_tool_vty.c b/src/osmo-pfcp-tool/pfcp_tool_vty.c index 70bca18..fcdbd67 100644 --- a/src/osmo-pfcp-tool/pfcp_tool_vty.c +++ b/src/osmo-pfcp-tool/pfcp_tool_vty.c @@ -261,7 +261,7 @@ { struct pfcp_tool_peer *peer = vty->index; struct pfcp_tool_session *session; - enum up_gtp_action_kind gtp_action = UP_GTP_U_ENDECAPS; + enum up_gtp_action_kind gtp_action = UP_GTP_U_TUNEND; if (argc > 0 && !strcmp(argv[0], "tunmap")) gtp_action = UP_GTP_U_TUNMAP; @@ -661,7 +661,7 @@ { struct pfcp_tool_session *session = vty->index; switch (session->gtp_action) { - case UP_GTP_U_ENDECAPS: + case UP_GTP_U_TUNEND: return session_tunend_tx_est_req(vty, argv, argc); case UP_GTP_U_TUNMAP: return session_tunmap_tx_est_req(vty, argv, argc); diff --git a/src/osmo-upf/up_gtp_action.c b/src/osmo-upf/up_gtp_action.c index 0f55ded..2471a61 100644 --- a/src/osmo-upf/up_gtp_action.c +++ b/src/osmo-upf/up_gtp_action.c @@ -47,15 +47,15 @@ return cmp; switch (a->kind) { - case UP_GTP_U_ENDECAPS: - if ((cmp = CMP_MEMB(endecaps.local_teid))) + case UP_GTP_U_TUNEND: + if ((cmp = CMP_MEMB(tunend.local_teid))) return cmp; - if ((cmp = CMP_MEMB(endecaps.remote_teid))) + if ((cmp = CMP_MEMB(tunend.remote_teid))) return cmp; - cmp = osmo_sockaddr_cmp(&a->endecaps.gtp_remote_addr, &b->endecaps.gtp_remote_addr); + cmp = osmo_sockaddr_cmp(&a->tunend.gtp_remote_addr, &b->tunend.gtp_remote_addr); if (cmp) return cmp; - cmp = osmo_sockaddr_cmp(&a->endecaps.ue_addr, &b->endecaps.ue_addr); + cmp = osmo_sockaddr_cmp(&a->tunend.ue_addr, &b->tunend.ue_addr); if (cmp) return cmp; break; @@ -82,7 +82,7 @@ int rc; switch (a->kind) { - case UP_GTP_U_ENDECAPS: + case UP_GTP_U_TUNEND: if (g_upf->gtp.mockup) { LOG_UP_GTP_ACTION(a, LOGL_NOTICE, "tunend/mockup active, skipping GTP action %s\n", enable ? "enable" : "disable"); @@ -99,9 +99,9 @@ } if (enable) - rc = upf_gtp_dev_tunnel_add(gtp_dev, &a->endecaps); + rc = upf_gtp_dev_tunnel_add(gtp_dev, &a->tunend); else - rc = upf_gtp_dev_tunnel_del(gtp_dev, &a->endecaps); + rc = upf_gtp_dev_tunnel_del(gtp_dev, &a->tunend); if (rc) { LOG_UP_GTP_ACTION(a, LOGL_ERROR, "Failed to %s GTP tunnel: %d %s\n", enable ? "enable" : "disable", rc, strerror(-rc)); @@ -165,12 +165,12 @@ { struct osmo_strbuf sb = { .buf = buf, .len = buflen }; switch (a->kind) { - case UP_GTP_U_ENDECAPS: + case UP_GTP_U_TUNEND: OSMO_STRBUF_PRINTF(sb, "GTP:tunend GTP-access:"); - OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->endecaps.gtp_remote_addr); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunend.gtp_remote_addr); OSMO_STRBUF_PRINTF(sb, " TEID-r:0x%"PRIx32" TEID-l:0x%"PRIx32" IP-core:", - a->endecaps.remote_teid, a->endecaps.local_teid); - OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->endecaps.ue_addr); + a->tunend.remote_teid, a->tunend.local_teid); + OSMO_STRBUF_APPEND(sb, osmo_sockaddr_to_str_buf2, &a->tunend.ue_addr); break; case UP_GTP_U_TUNMAP: OSMO_STRBUF_PRINTF(sb, "GTP:tunmap GTP-access:"); diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index f35a6eb..e77fe6b 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -1129,8 +1129,8 @@ .session = session, .pdr_core = pdr->desc.pdr_id, .pdr_access = rpdr->desc.pdr_id, - .kind = UP_GTP_U_ENDECAPS, - .endecaps = { + .kind = UP_GTP_U_TUNEND, + .tunend = { .local_teid = pdr->local_f_teid->fixed.teid, .remote_teid = rfar_forw->outer_header_creation.teid, .gtp_remote_addr = rfar_forw->outer_header_creation.ip_addr.v4, -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I55ce7cc842f36b2528e6a1a15d6f3bcb960f492b Gerrit-Change-Number: 30234 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange