- gerrit-log - lists.osmocom.org

Change in osmo-e1-hardware[master]: icE1usb fw: Set wDetachTimeout to 0 in DFU descriptor

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26829 ) Change subject: icE1usb fw: Set wDetachTimeout to 0 in DFU descriptor ...................................................................... icE1usb fw: Set wDetachTimeout to 0 in DFU descriptor It was pointed out that this should be 0 since we trigger detach ourselves, we don't need a bus reset. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: Id7051ce00863c03e3498f4bab0a7124938e197c0 --- M firmware/ice40-riscv/icE1usb/usb_desc_app.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/29/26829/1 diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_app.c b/firmware/ice40-riscv/icE1usb/usb_desc_app.c index 886181c..246e70f 100644 --- a/firmware/ice40-riscv/icE1usb/usb_desc_app.c +++ b/firmware/ice40-riscv/icE1usb/usb_desc_app.c @@ -230,7 +230,7 @@ .bLength = sizeof(struct usb_dfu_func_desc), .bDescriptorType = USB_DFU_DT_FUNC, .bmAttributes = 0x0d, - .wDetachTimeOut = 1000, + .wDetachTimeOut = 0, .wTransferSize = 4096, .bcdDFUVersion = 0x0101, }, -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: Id7051ce00863c03e3498f4bab0a7124938e197c0 Gerrit-Change-Number: 26829 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-MessageType: newchange

3 years, 5 months

2
2
0 0

Change in osmo-e1-hardware[master]: icE1usb fw: Cleanup USB code a bit

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26828 ) Change subject: icE1usb fw: Cleanup USB code a bit ...................................................................... icE1usb fw: Cleanup USB code a bit Some of it was written before some of the helpers were provided by the no2usb code and was never update. So instead of manually setting up a bunch of stuff we make proper use of some of the provided helpers. Side effects: - We recall e1_init(0,0) when enabling which happens to work around a bug ... proper fix coming later. - The 'dual BD' config for EP 0x81 and 0x83 is fixed. It didn't matter before since we overwrote it anyway, but now it's used and so needs to be correct. - The descriptors don't have the isoc endpoints at all in the "OFF" alt setting. Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I33c92896acfba023abe0152d63dff3afe43b53cd --- M firmware/ice40-riscv/icE1usb/usb_desc_app.c M firmware/ice40-riscv/icE1usb/usb_e1.c 2 files changed, 31 insertions(+), 112 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/28/26828/1 diff --git a/firmware/ice40-riscv/icE1usb/usb_desc_app.c b/firmware/ice40-riscv/icE1usb/usb_desc_app.c index 544ac23..886181c 100644 --- a/firmware/ice40-riscv/icE1usb/usb_desc_app.c +++ b/firmware/ice40-riscv/icE1usb/usb_desc_app.c @@ -24,13 +24,10 @@ struct { /* Two altsettings are required, as isochronous * interfaces must have a setting where they don't - * transceive any data. wMaxPacketSize is 0 for - * all endpoints in the 'off' altsetting */ + * transceive any data. We just remove the isochronous + * endpoints in the 'off' altsetting */ struct { struct usb_intf_desc intf; - struct usb_ep_desc ep_data_in; - struct usb_ep_desc ep_data_out; - struct usb_ep_desc ep_fb; struct usb_ep_desc ep_interrupt; } __attribute__ ((packed)) off; struct { @@ -83,36 +80,12 @@ .bDescriptorType = USB_DT_INTF, .bInterfaceNumber = 0, .bAlternateSetting = 0, - .bNumEndpoints = 4, + .bNumEndpoints = 1, .bInterfaceClass = 0xff, .bInterfaceSubClass = 0xe1, .bInterfaceProtocol = 0x00, .iInterface = 5, }, - .ep_data_in = { - .bLength = sizeof(struct usb_ep_desc), - .bDescriptorType = USB_DT_EP, - .bEndpointAddress = 0x82, - .bmAttributes = 0x05, - .wMaxPacketSize = 0, - .bInterval = 1, - }, - .ep_data_out = { - .bLength = sizeof(struct usb_ep_desc), - .bDescriptorType = USB_DT_EP, - .bEndpointAddress = 0x01, - .bmAttributes = 0x05, - .wMaxPacketSize = 0, - .bInterval = 1, - }, - .ep_fb = { - .bLength = sizeof(struct usb_ep_desc), - .bDescriptorType = USB_DT_EP, - .bEndpointAddress = 0x81, - .bmAttributes = 0x11, - .wMaxPacketSize = 0, - .bInterval = 3, - }, .ep_interrupt = { .bLength = sizeof(struct usb_ep_desc), .bDescriptorType = USB_DT_EP, diff --git a/firmware/ice40-riscv/icE1usb/usb_e1.c b/firmware/ice40-riscv/icE1usb/usb_e1.c index e180fec..b4d8839 100644 --- a/firmware/ice40-riscv/icE1usb/usb_e1.c +++ b/firmware/ice40-riscv/icE1usb/usb_e1.c @@ -71,8 +71,7 @@ val -= 256; /* Prepare buffer */ - usb_data_write(64, &val, 4); - usb_ep_regs[1].in.bd[0].ptr = 64; + usb_data_write(usb_ep_regs[1].in.bd[0].ptr, &val, 4); usb_ep_regs[1].in.bd[0].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(3); } @@ -189,33 +188,6 @@ } } -static const struct usb_intf_desc * -_find_intf(const struct usb_conf_desc *conf, uint8_t idx) -{ - const struct usb_intf_desc *intf = NULL; - const void *sod, *eod; - - if (!conf) - return NULL; - - sod = conf; - eod = sod + conf->wTotalLength; - - while (1) { - sod = usb_desc_find(sod, eod, USB_DT_INTF); - if (!sod) - break; - - intf = (void*)sod; - if (intf->bInterfaceNumber == idx) - return intf; - - sod = usb_desc_next(sod); - } - - return NULL; -} - static enum usb_fnd_resp _e1_set_conf(const struct usb_conf_desc *conf) { @@ -225,16 +197,16 @@ if (!conf) return USB_FND_SUCCESS; - intf = _find_intf(conf, 0); + intf = usb_desc_find_intf(conf, 0, 0, NULL); if (!intf) return USB_FND_ERROR; printf("e1 set_conf %08x\n", intf); usb_ep_boot(intf, 0x01, true); - usb_ep_boot(intf, 0x81, true); + usb_ep_boot(intf, 0x81, false); usb_ep_boot(intf, 0x82, true); - usb_ep_boot(intf, 0x83, true); + usb_ep_boot(intf, 0x83, false); return USB_FND_SUCCESS; } @@ -257,76 +229,50 @@ static enum usb_fnd_resp _e1_set_intf(const struct usb_intf_desc *base, const struct usb_intf_desc *sel) { + /* Validity checks */ if (base->bInterfaceNumber != 0) return USB_FND_CONTINUE; - switch (sel->bAlternateSetting) { - case 0: - if (!g_usb_e1.running) - return USB_FND_SUCCESS; + if (sel->bAlternateSetting > 1) + return USB_FND_ERROR; - /* disable E1 rx/tx */ + /* Don't do anything if no change */ + if (g_usb_e1.running == (sel->bAlternateSetting != 0)) + return USB_FND_SUCCESS; + + g_usb_e1.running = (sel->bAlternateSetting != 0); + + /* Reconfigure the endpoints */ + usb_ep_reconf(sel, 0x01); + usb_ep_reconf(sel, 0x81); + usb_ep_reconf(sel, 0x82); + usb_ep_reconf(sel, 0x83); + + /* Update E1 and USB state */ + switch (g_usb_e1.running) { + case false: + /* Disable E1 rx/tx */ e1_init(0, 0); - - /* EP1 OUT */ - usb_ep_regs[1].out.bd[0].csr = 0; - usb_ep_regs[1].out.bd[1].csr = 0; - - /* EP1 IN (feedback) */ - usb_ep_regs[1].in.bd[0].csr = 0; - - /* EP2 IN (data) */ - usb_ep_regs[2].in.bd[0].csr = 0; - usb_ep_regs[2].in.bd[1].csr = 0; - - /* EP3 IN: Interrupt */ - usb_ep_regs[3].in.bd[0].csr = 0; - - g_usb_e1.running = false; break; - case 1: - /* Hack to avoid re-setting while running ... avoid BD desync */ - if (g_usb_e1.running) - return USB_FND_SUCCESS; + case true: + /* Reset and Re-Enable E1 */ + e1_init(0, 0); _perform_rx_config(); _perform_tx_config(); - g_usb_e1.running = true; - - /* Configure EP1 OUT / EP2 IN */ - usb_ep_regs[1].out.status = USB_EP_TYPE_ISOC | USB_EP_BD_DUAL; /* Type=Isochronous, dual buffered */ - usb_ep_regs[2].in.status = USB_EP_TYPE_ISOC | USB_EP_BD_DUAL; /* Type=Isochronous, dual buffered */ - - /* Configure EP1 IN (feedback) */ - usb_ep_regs[1].in.status = USB_EP_TYPE_ISOC; /* Type=Isochronous, single buffered */ - - /* EP2 IN: Prepare two buffers */ + /* Reset BDI */ g_usb_e1.in_bdi = 0; - usb_ep_regs[2].in.bd[0].ptr = 1024; - usb_ep_regs[2].in.bd[0].csr = 0; - - usb_ep_regs[2].in.bd[1].ptr = 1536; - usb_ep_regs[2].in.bd[1].csr = 0; + g_usb_e1.out_bdi = 0; /* EP1 OUT: Queue two buffers */ - g_usb_e1.out_bdi = 0; - usb_ep_regs[1].out.bd[0].ptr = 1024; usb_ep_regs[1].out.bd[0].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(388); - - usb_ep_regs[1].out.bd[1].ptr = 1536; usb_ep_regs[1].out.bd[1].csr = USB_BD_STATE_RDY_DATA | USB_BD_LEN(388); /* EP1 IN: Queue buffer */ _usb_fill_feedback_ep(); - /* EP3 IN: Interrupt */ - usb_ep_regs[3].in.status = USB_EP_TYPE_INT; - usb_ep_regs[3].in.bd[0].ptr = 68; - usb_ep_regs[3].in.bd[0].csr = 0; break; - default: - return USB_FND_ERROR; } return USB_FND_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/26828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I33c92896acfba023abe0152d63dff3afe43b53cd Gerrit-Change-Number: 26828 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

2
3
0 0

Change in libosmocore[master]: contrib/libosmocore.spec.in: mention osmo-config-merge in utils

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26687 ) Change subject: contrib/libosmocore.spec.in: mention osmo-config-merge in utils ...................................................................... contrib/libosmocore.spec.in: mention osmo-config-merge in utils Change-Id: I4d3d06b2f27ded60f9408e326202c5c6bf6d35d1 --- M contrib/libosmocore.spec.in 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/contrib/libosmocore.spec.in b/contrib/libosmocore.spec.in index 3018280..c2fe738 100644 --- a/contrib/libosmocore.spec.in +++ b/contrib/libosmocore.spec.in @@ -54,7 +54,8 @@ This package contains a program for frequency calculation for GSM called "osmo-arfcn", and a program called "osmo-auc-gen" that is used -for testing GSM authentication. +for testing GSM authentication, as well as "osmo-config-merge", a tool +for merging Osmocom configuration files. %package -n libosmocodec0 Summary: GSM 06.10, 06.20, 06.60, 06.90 codec library -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d3d06b2f27ded60f9408e326202c5c6bf6d35d1 Gerrit-Change-Number: 26687 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in libosmocore[master]: contrib/libosmocore.spec.in: mention osmo-config-merge in utils

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26687 ) Change subject: contrib/libosmocore.spec.in: mention osmo-config-merge in utils ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4d3d06b2f27ded60f9408e326202c5c6bf6d35d1 Gerrit-Change-Number: 26687 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jan 2022 14:40:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-iuh[master]: iu_helpers: make new_transp_info_(rtp|gtp) public

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26722 ) Change subject: iu_helpers: make new_transp_info_(rtp|gtp) public ...................................................................... iu_helpers: make new_transp_info_(rtp|gtp) public The functions new_transp_info_rtp and new_transp_info_gtp are needed to generate the transport layer information struct. The functions are currently not public since they are only used in ranap_msg_factory.c but to reqwrite the RANAP RAB AssignmentReqtest / AssignmentResponse messages we can reuse this code, so lets make them public. Change-Id: I1e369718de8c4c7db1f1af1e6864562164ada6cf Related: OS#5152 --- M include/osmocom/ranap/iu_helpers.h M src/iu_helpers.c M src/ranap_msg_factory.c M src/tests/test-helpers.c M src/tests/test-helpers.ok 5 files changed, 267 insertions(+), 59 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/ranap/iu_helpers.h b/include/osmocom/ranap/iu_helpers.h index 9d801be..d824646 100644 --- a/include/osmocom/ranap/iu_helpers.h +++ b/include/osmocom/ranap/iu_helpers.h @@ -1,13 +1,20 @@ #pragma once #include <stdint.h> +#include <stdbool.h> #include <sys/types.h> #include <osmocom/ranap/RANAP_IuTransportAssociation.h> #include <osmocom/ranap/RANAP_TransportLayerAddress.h> +#include <osmocom/ranap/RANAP_TransportLayerInformation.h> + +struct osmo_sockaddr; int ranap_bcd_decode(char *out, size_t out_len, const uint8_t *in, size_t in_len); int ranap_imsi_encode(uint8_t *out, size_t out_len, const char *in); int ranap_transp_assoc_decode(uint16_t *port, const RANAP_IuTransportAssociation_t *transp_assoc); int ranap_transp_layer_addr_decode(char *addr, unsigned int addr_len, const RANAP_TransportLayerAddress_t *trasp_layer_addr); +RANAP_TransportLayerInformation_t *ranap_new_transp_info_rtp(struct osmo_sockaddr *addr, bool use_x213_nsap); +RANAP_TransportLayerInformation_t *ranap_new_transp_info_gtp(struct osmo_sockaddr *addr, uint32_t tei, + bool use_x213_nsap); diff --git a/src/iu_helpers.c b/src/iu_helpers.c index bf82fde..392622f 100644 --- a/src/iu_helpers.c +++ b/src/iu_helpers.c @@ -24,8 +24,12 @@ #include <arpa/inet.h> #include "asn1helpers.h" #include <osmocom/core/utils.h> +#include <osmocom/core/socket.h> +#include <osmocom/core/bit16gen.h> + #include <osmocom/ranap/RANAP_IuTransportAssociation.h> #include <osmocom/ranap/RANAP_TransportLayerAddress.h> +#include <osmocom/ranap/RANAP_TransportLayerInformation.h> /* decode a BCD-string as used inside ASN.1 encoded Iu interface protocols */ int ranap_bcd_decode(char *out, size_t out_len, const uint8_t *in, size_t in_len) @@ -121,3 +125,102 @@ return 0; } + +static int new_transp_layer_addr(BIT_STRING_t *out, struct osmo_sockaddr *addr, bool use_x213_nsap) +{ + uint8_t *buf; + unsigned int len; + size_t ip_len; + uint8_t *ip_addr; + uint16_t icp; + + switch (addr->u.sa.sa_family) { + case AF_INET: + ip_len = sizeof(addr->u.sin.sin_addr.s_addr); + ip_addr = (uint8_t *) &addr->u.sin.sin_addr.s_addr; + icp = 0x0001; /* See X.213, section A.5.2.1.2.7 */ + break; + case AF_INET6: + ip_len = sizeof(addr->u.sin6.sin6_addr.s6_addr); + ip_addr = addr->u.sin6.sin6_addr.s6_addr; + icp = 0x0000; /* See X.213, section A.5.2.1.2.7 */ + break; + default: + return -EINVAL; + } + + if (use_x213_nsap) { + /* 3 bytes IDP (AFI+ICP) + 17 bytes DSP */ + len = 3 + 17; + buf = CALLOC(len, sizeof(uint8_t)); + + /* 1 byte AFI to announce IANA ICP, see also X.213, table A.4 */ + buf[0] = 0x35; + + /* 2 byte IANA ICP IDI, see also X.213, A.5.2.1.2.7 */ + osmo_store16be(icp, &buf[1]); + + /* 17 byte DSP, see also X.213, table A.5 and A.5.2.1.2.7 */ + memcpy(&buf[3], ip_addr, ip_len); + } else { + len = ip_len; + buf = CALLOC(len, sizeof(uint8_t)); + memcpy(buf, ip_addr, ip_len); + } + out->buf = buf; + out->size = len; + out->bits_unused = 0; + + return 0; +} + +RANAP_TransportLayerInformation_t *ranap_new_transp_info_rtp(struct osmo_sockaddr *addr, bool use_x213_nsap) +{ + RANAP_TransportLayerInformation_t *tli; + uint8_t binding_id[4] = { 0 }; + int rc; + + switch (addr->u.sin.sin_family) { + case AF_INET: + osmo_store16be(ntohs(addr->u.sin.sin_port), binding_id); + break; + case AF_INET6: + osmo_store16be(ntohs(addr->u.sin6.sin6_port), binding_id); + break; + default: + return NULL; + } + + tli = CALLOC(1, sizeof(*tli)); + rc = new_transp_layer_addr(&tli->transportLayerAddress, addr, use_x213_nsap); + if (rc < 0) { + ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, tli); + return NULL; + } + + tli->iuTransportAssociation.present = RANAP_IuTransportAssociation_PR_bindingID; + OCTET_STRING_fromBuf(&tli->iuTransportAssociation.choice.bindingID, + (const char *)binding_id, sizeof(binding_id)); + + return tli; +} + +RANAP_TransportLayerInformation_t *ranap_new_transp_info_gtp(struct osmo_sockaddr *addr, uint32_t tei, + bool use_x213_nsap) +{ + RANAP_TransportLayerInformation_t *tli = CALLOC(1, sizeof(*tli)); + uint32_t binding_buf = htonl(tei); + int rc; + + rc = new_transp_layer_addr(&tli->transportLayerAddress, addr, use_x213_nsap); + if (rc < 0) { + ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, tli); + return NULL; + } + + tli->iuTransportAssociation.present = RANAP_IuTransportAssociation_PR_gTP_TEI; + OCTET_STRING_fromBuf(&tli->iuTransportAssociation.choice.gTP_TEI, + (const char *)&binding_buf, sizeof(binding_buf)); + + return tli; +} diff --git a/src/ranap_msg_factory.c b/src/ranap_msg_factory.c index f93a2ab..60dc9e0 100644 --- a/src/ranap_msg_factory.c +++ b/src/ranap_msg_factory.c @@ -20,6 +20,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/msgb.h> +#include <osmocom/core/socket.h> #include "asn1helpers.h" #include <osmocom/ranap/iu_helpers.h> @@ -691,61 +692,6 @@ return rab; } -static void new_transp_layer_addr(BIT_STRING_t *out, uint32_t ip, bool use_x213_nsap) -{ - uint8_t *buf; - unsigned int len; - uint32_t ip_h = ntohl(ip); - - if (use_x213_nsap) { - len = 160/8; - buf = CALLOC(len, sizeof(uint8_t)); - buf[0] = 0x35; /* AFI For IANA ICP */ - buf[1] = 0x00; /* See A.5.2.1.2.7 of X.213 */ - buf[2] = 0x01; - memcpy(&buf[3], &ip_h, sizeof(ip_h)); - } else { - len = sizeof(ip_h); - buf = CALLOC(len, sizeof(uint8_t)); - memcpy(buf, &ip_h, sizeof(ip_h)); - } - out->buf = buf; - out->size = len; - out->bits_unused = 0; -} - -static RANAP_TransportLayerInformation_t *new_transp_info_rtp(uint32_t ip, uint16_t port, - bool use_x213_nsap) -{ - RANAP_TransportLayerInformation_t *tli = CALLOC(1, sizeof(*tli)); - uint8_t binding_id[4]; - - binding_id[0] = port >> 8; - binding_id[1] = port & 0xff; - binding_id[2] = binding_id[3] = 0; - - new_transp_layer_addr(&tli->transportLayerAddress, ip, use_x213_nsap); - tli->iuTransportAssociation.present = RANAP_IuTransportAssociation_PR_bindingID; - OCTET_STRING_fromBuf(&tli->iuTransportAssociation.choice.bindingID, - (const char *) binding_id, sizeof(binding_id)); - - return tli; -} - -static RANAP_TransportLayerInformation_t *new_transp_info_gtp(uint32_t ip, uint32_t tei, - bool use_x213_nsap) -{ - RANAP_TransportLayerInformation_t *tli = CALLOC(1, sizeof(*tli)); - uint32_t binding_buf = htonl(tei); - - new_transp_layer_addr(&tli->transportLayerAddress, ip, use_x213_nsap); - tli->iuTransportAssociation.present = RANAP_IuTransportAssociation_PR_gTP_TEI; - OCTET_STRING_fromBuf(&tli->iuTransportAssociation.choice.gTP_TEI, - (const char *) &binding_buf, sizeof(binding_buf)); - - return tli; -} - static RANAP_UserPlaneInformation_t *new_upi(long mode, uint8_t mode_versions) { RANAP_UserPlaneInformation_t *upi = CALLOC(1, sizeof(*upi)); @@ -786,6 +732,7 @@ RANAP_RAB_AssignmentRequest_t out; struct msgb *msg; int rc; + struct osmo_sockaddr rtp_addr; memset(&ies, 0, sizeof(ies)); memset(&out, 0, sizeof(out)); @@ -800,8 +747,11 @@ first.nAS_SynchronisationIndicator = new_rab_nas_sync_ind(60); first.rAB_Parameters = new_rab_par_voice(6700, 12200); first.userPlaneInformation = new_upi(RANAP_UserPlaneMode_support_mode_for_predefined_SDU_sizes, 1); /* 2? */ - first.transportLayerInformation = new_transp_info_rtp(rtp_ip, rtp_port, - use_x213_nsap); + + rtp_addr.u.sin.sin_family = AF_INET; + rtp_addr.u.sin.sin_port = htons(rtp_port); + rtp_addr.u.sin.sin_addr.s_addr = htonl(rtp_ip); + first.transportLayerInformation = ranap_new_transp_info_rtp(&rtp_addr, use_x213_nsap); /* put together the 'Second' part */ RANAP_RAB_SetupOrModifyItemSecond_t second; @@ -855,6 +805,7 @@ RANAP_DataVolumeReportingIndication_t *dat_vol_ind; struct msgb *msg; int rc; + struct osmo_sockaddr gtp_addr; memset(&ies, 0, sizeof(ies)); memset(&out, 0, sizeof(out)); @@ -870,8 +821,10 @@ first.rAB_Parameters = new_rab_par_data(1600000, 800000); first.userPlaneInformation = new_upi(RANAP_UserPlaneMode_transparent_mode, 1); - first.transportLayerInformation = new_transp_info_gtp(gtp_ip, gtp_tei, - use_x213_nsap); + + gtp_addr.u.sin.sin_family = AF_INET; + gtp_addr.u.sin.sin_addr.s_addr = htonl(gtp_ip); + first.transportLayerInformation = ranap_new_transp_info_gtp(&gtp_addr, gtp_tei, use_x213_nsap); /* put together the 'Second' part */ RANAP_RAB_SetupOrModifyItemSecond_t second; diff --git a/src/tests/test-helpers.c b/src/tests/test-helpers.c index 5c617e5..96540dc 100644 --- a/src/tests/test-helpers.c +++ b/src/tests/test-helpers.c @@ -28,6 +28,7 @@ #define ASSERT(x) assert(x) #include <osmocom/core/utils.h> +#include <osmocom/core/socket.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/ranap/RANAP_LAI.h> @@ -204,6 +205,120 @@ OSMO_ASSERT(rc == -1); } +void test_ranap_new_transp_info_rtp(void) +{ + RANAP_TransportLayerInformation_t *tli; + + printf("Testing function ranap_new_transp_info_rtp()\n"); + + struct osmo_sockaddr addr; + + addr.u.sin.sin_family = AF_INET; + addr.u.sin.sin_port = htons(0x1122); + inet_pton(AF_INET, "1.2.3.4", &addr.u.sin.sin_addr); + + printf(" ipv4, x213_nsap\n"); + tli = ranap_new_transp_info_rtp(&addr, true); + printf(" transportLayerAddress = %s\n", + osmo_hexdump_nospc(tli->transportLayerAddress.buf, tli->transportLayerAddress.size)); + printf(" bindingID = %s\n", + osmo_hexdump_nospc(tli->iuTransportAssociation.choice.bindingID.buf, + tli->iuTransportAssociation.choice.bindingID.size)); + ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, tli); + + printf(" ipv4\n"); + tli = ranap_new_transp_info_rtp(&addr, false); + printf(" transportLayerAddress = %s\n", + osmo_hexdump_nospc(tli->transportLayerAddress.buf, tli->transportLayerAddress.size)); + printf(" bindingID = %s\n", + osmo_hexdump_nospc(tli->iuTransportAssociation.choice.bindingID.buf, + tli->iuTransportAssociation.choice.bindingID.size)); + ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, tli); + + addr.u.sin.sin_family = AF_INET6; + addr.u.sin.sin_port = htons(0x1122); + inet_pton(AF_INET6, "f11f:f22f:f33f:f44f:f55f:f66f:f77f:f88f", &addr.u.sin6.sin6_addr); + + printf(" ipv6, x213_nsap\n"); + tli = ranap_new_transp_info_rtp(&addr, true); + printf(" transportLayerAddress = %s\n", + osmo_hexdump_nospc(tli->transportLayerAddress.buf, tli->transportLayerAddress.size)); + printf(" bindingID = %s\n", + osmo_hexdump_nospc(tli->iuTransportAssociation.choice.bindingID.buf, + tli->iuTransportAssociation.choice.bindingID.size)); + ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, tli); + + printf(" ipv6\n"); + tli = ranap_new_transp_info_rtp(&addr, false); + printf(" transportLayerAddress = %s\n", + osmo_hexdump_nospc(tli->transportLayerAddress.buf, tli->transportLayerAddress.size)); + printf(" bindingID = %s\n", + osmo_hexdump_nospc(tli->iuTransportAssociation.choice.bindingID.buf, + tli->iuTransportAssociation.choice.bindingID.size)); + ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, tli); + + addr.u.sin.sin_family = AF_X25; + printf(" unsupported address family\n"); + tli = ranap_new_transp_info_rtp(&addr, false); + OSMO_ASSERT(tli == NULL); +} + +void test_ranap_new_transp_info_gtp(void) +{ + RANAP_TransportLayerInformation_t *tli; + + printf("Testing function ranap_new_transp_info_gtp()\n"); + + struct osmo_sockaddr addr; + + addr.u.sin.sin_family = AF_INET; + inet_pton(AF_INET, "1.2.3.4", &addr.u.sin.sin_addr); + + printf(" ipv4, x213_nsap\n"); + tli = ranap_new_transp_info_gtp(&addr, 0x11223344, true); + printf(" transportLayerAddress = %s\n", + osmo_hexdump_nospc(tli->transportLayerAddress.buf, tli->transportLayerAddress.size)); + printf(" gTP_TEI = %s\n", + osmo_hexdump_nospc(tli->iuTransportAssociation.choice.gTP_TEI.buf, + tli->iuTransportAssociation.choice.gTP_TEI.size)); + ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, tli); + + printf(" ipv4\n"); + tli = ranap_new_transp_info_gtp(&addr, 0x11223344, false); + printf(" transportLayerAddress = %s\n", + osmo_hexdump_nospc(tli->transportLayerAddress.buf, tli->transportLayerAddress.size)); + printf(" gTP_TEI = %s\n", + osmo_hexdump_nospc(tli->iuTransportAssociation.choice.gTP_TEI.buf, + tli->iuTransportAssociation.choice.gTP_TEI.size)); + ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, tli); + + addr.u.sin.sin_family = AF_INET6; + inet_pton(AF_INET6, "f11f:f22f:f33f:f44f:f55f:f66f:f77f:f88f", &addr.u.sin6.sin6_addr); + + printf(" ipv6, x213_nsap\n"); + tli = ranap_new_transp_info_gtp(&addr, 0x11223344, true); + printf(" transportLayerAddress = %s\n", + osmo_hexdump_nospc(tli->transportLayerAddress.buf, tli->transportLayerAddress.size)); + printf(" gTP_TEI = %s\n", + osmo_hexdump_nospc(tli->iuTransportAssociation.choice.gTP_TEI.buf, + tli->iuTransportAssociation.choice.gTP_TEI.size)); + ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, tli); + + printf(" ipv6\n"); + tli = ranap_new_transp_info_gtp(&addr, 0x11223344, false); + printf(" transportLayerAddress = %s\n", + osmo_hexdump_nospc(tli->transportLayerAddress.buf, tli->transportLayerAddress.size)); + printf(" gTP_TEI = %s\n", + osmo_hexdump_nospc(tli->iuTransportAssociation.choice.gTP_TEI.buf, + tli->iuTransportAssociation.choice.gTP_TEI.size)); + ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, tli); + + addr.u.sin.sin_family = AF_X25; + printf(" unsupported address family\n"); + tli = ranap_new_transp_info_gtp(&addr, 0x11223344, false); + OSMO_ASSERT(tli == NULL); +} + int main(int argc, char **argv) { asn1_xer_print = 0; @@ -214,6 +329,8 @@ test_iu_helpers(); test_asn1_helpers(); test_ranap_common(); + test_ranap_new_transp_info_gtp(); + test_ranap_new_transp_info_rtp(); test_common_cleanup(); return 0; diff --git a/src/tests/test-helpers.ok b/src/tests/test-helpers.ok index f2e466f..049fbb4 100644 --- a/src/tests/test-helpers.ok +++ b/src/tests/test-helpers.ok @@ -23,3 +23,31 @@ rc == -1 PLMN-Id [ 21 43 65 ], LAC [ ab ] rc == -1 +Testing function ranap_new_transp_info_gtp() + ipv4, x213_nsap + transportLayerAddress = 3500010102030400000000000000000000000000 + gTP_TEI = 11223344 + ipv4 + transportLayerAddress = 01020304 + gTP_TEI = 11223344 + ipv6, x213_nsap + transportLayerAddress = 350000f11ff22ff33ff44ff55ff66ff77ff88f00 + gTP_TEI = 11223344 + ipv6 + transportLayerAddress = f11ff22ff33ff44ff55ff66ff77ff88f + gTP_TEI = 11223344 + unsupported address family +Testing function ranap_new_transp_info_rtp() + ipv4, x213_nsap + transportLayerAddress = 3500010102030400000000000000000000000000 + bindingID = 11220000 + ipv4 + transportLayerAddress = 01020304 + bindingID = 11220000 + ipv6, x213_nsap + transportLayerAddress = 350000f11ff22ff33ff44ff55ff66ff77ff88f00 + bindingID = 11220000 + ipv6 + transportLayerAddress = f11ff22ff33ff44ff55ff66ff77ff88f + bindingID = 11220000 + unsupported address family -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1e369718de8c4c7db1f1af1e6864562164ada6cf Gerrit-Change-Number: 26722 Gerrit-PatchSet: 6 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-iuh[master]: iu_helpers: make new_transp_info_(rtp|gtp) public

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26722 ) Change subject: iu_helpers: make new_transp_info_(rtp|gtp) public ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1e369718de8c4c7db1f1af1e6864562164ada6cf Gerrit-Change-Number: 26722 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jan 2022 14:00:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in libosmocore[master]: iuup: Improve CRC checksum error logging

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26825 ) Change subject: iuup: Improve CRC checksum error logging ...................................................................... iuup: Improve CRC checksum error logging Change-Id: I14f2ff14af24f20b788d123c0bfb47aeb0333d19 --- M src/gsm/iuup.c 1 file changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/25/26825/1 diff --git a/src/gsm/iuup.c b/src/gsm/iuup.c index c0e12a7..7881257 100644 --- a/src/gsm/iuup.c +++ b/src/gsm/iuup.c @@ -835,7 +835,7 @@ header_crc_computed = osmo_iuup_compute_header_crc(data, len); if (iuup_get_hdr_crc(data) != header_crc_computed) { - LOGP(DLIUUP, LOGL_NOTICE, "Checksum error: rx 0x%02x vs exp 0x%02x\n", + LOGP(DLIUUP, LOGL_NOTICE, "Header Checksum error: rx 0x%02x vs exp 0x%02x\n", iuup_get_hdr_crc(data), header_crc_computed); return -EIO; } @@ -849,7 +849,7 @@ payload_crc = ((uint16_t)t0h->payload_crc_hi << 8) | t0h->payload_crc_lo; payload_crc_computed = osmo_iuup_compute_payload_crc(data, len); if (payload_crc != payload_crc_computed) - return -EIO; + goto payload_crc_err; break; case IUUP_PDU_T_CONTROL: t14h = (struct iuup_pdutype14_hdr *) data; @@ -857,13 +857,18 @@ payload_crc = ((uint16_t)t14h->payload_crc_hi << 8) | t14h->payload_crc_lo; payload_crc_computed = osmo_iuup_compute_payload_crc(data, len); if (payload_crc != payload_crc_computed) - return -EIO; + goto payload_crc_err; } break; default: return -EINVAL; } return 0; + +payload_crc_err: + LOGP(DLIUUP, LOGL_NOTICE, "Payload Checksum error: rx 0x%02x vs exp 0x%02x\n", + payload_crc, payload_crc_computed); + return -EIO; } /* A IuUP TNL SAP primitive from transport (lower layer) */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I14f2ff14af24f20b788d123c0bfb47aeb0333d19 Gerrit-Change-Number: 26825 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
3
0 0

Change in libosmocore[master]: msgb: Fix -Wsign-compare warnings

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26815 ) Change subject: msgb: Fix -Wsign-compare warnings ...................................................................... msgb: Fix -Wsign-compare warnings Change-Id: I4bd14bb712fb3868b55d7e79d13276b707a6cdcb --- M src/msgb.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/26815/1 diff --git a/src/msgb.c b/src/msgb.c index ccb55aa..0881a55 100644 --- a/src/msgb.c +++ b/src/msgb.c @@ -426,11 +426,11 @@ */ char *msgb_hexdump_buf(char *buf, size_t buf_len, const struct msgb *msg) { - int buf_offs = 0; + unsigned int buf_offs = 0; int nchars; const unsigned char *start = msg->data; const unsigned char *lxhs[4]; - int i; + unsigned int i; lxhs[0] = msg->l1h; lxhs[1] = msg->l2h; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4bd14bb712fb3868b55d7e79d13276b707a6cdcb Gerrit-Change-Number: 26815 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 5 months

2
3
0 0

Change in libosmocore[master]: socket, select: Fix -Wsign-compare warnings

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26814 ) Change subject: socket, select: Fix -Wsign-compare warnings ...................................................................... socket, select: Fix -Wsign-compare warnings Change-Id: Idf6213e66e9bf609e930c6134292458a7d521871 --- M src/select.c M src/socket.c 2 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/26814/1 diff --git a/src/select.c b/src/select.c index ddff132..735ea3e 100644 --- a/src/select.c +++ b/src/select.c @@ -316,7 +316,7 @@ } /* iterate over first n_fd entries of g_poll.poll + dispatch */ -static int poll_disp_fds(int n_fd) +static int poll_disp_fds(unsigned int n_fd) { struct osmo_fd *ufd; unsigned int i; diff --git a/src/socket.c b/src/socket.c index 1251061..b33116c 100644 --- a/src/socket.c +++ b/src/socket.c @@ -114,7 +114,7 @@ static int addrinfo_helper_multi(struct addrinfo **addrinfo, uint16_t family, uint16_t type, uint8_t proto, const char **hosts, size_t host_cnt, uint16_t port, bool passive) { - int i, j; + unsigned int i, j; for (i = 0; i < host_cnt; i++) { addrinfo[i] = addrinfo_helper(family, type, proto, hosts[i], port, passive); @@ -210,7 +210,8 @@ static int multiaddr_snprintf(char* buf, size_t buf_len, const char **hosts, size_t host_cnt) { int len = 0, offset = 0, rem = buf_len; - int ret, i; + unsigned int i; + int ret; char *after; if (buf_len < 3) @@ -665,7 +666,7 @@ /* Build array of addresses taking first addrinfo result of the requested family * for each host in addrs_buf. */ static int addrinfo_to_sockaddr(uint16_t family, const struct addrinfo **result, - const char **hosts, int host_cont, + const char **hosts, unsigned int host_cont, uint8_t *addrs_buf, size_t addrs_buf_len) { size_t host_idx, offset = 0; const struct addrinfo *rp; @@ -721,7 +722,7 @@ { struct addrinfo *res_loc[OSMO_SOCK_MAX_ADDRS], *res_rem[OSMO_SOCK_MAX_ADDRS]; int sfd = -1, rc, on = 1; - int i; + unsigned int i; bool loc_has_v4addr, rem_has_v4addr; bool loc_has_v6addr, rem_has_v6addr; struct sockaddr_in6 addrs_buf[OSMO_SOCK_MAX_ADDRS]; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idf6213e66e9bf609e930c6134292458a7d521871 Gerrit-Change-Number: 26814 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

3
6
0 0

Change in osmo-iuh[master]: iu_helpers: make new_transp_info_(rtp|gtp) public

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26722 ) Change subject: iu_helpers: make new_transp_info_(rtp|gtp) public ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1e369718de8c4c7db1f1af1e6864562164ada6cf Gerrit-Change-Number: 26722 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Jan 2022 10:29:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log