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

Change in osmo-pcu[master]: lc15/oc2g: fix function signature of l1if_open_pdch()

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31330 ) Change subject: lc15/oc2g: fix function signature of l1if_open_pdch() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If1693b1b74c1808596d7da639b860f7b226385c0 Gerrit-Change-Number: 31330 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Feb 2023 15:11:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-pcu[master]: osmo-bts-xyz: include pcu_l1_if_phy.h in phy in l1_if code

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31329 ) Change subject: osmo-bts-xyz: include pcu_l1_if_phy.h in phy in l1_if code ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id35ba473973108da4e36d5c6f2ca78da1225ae8b Gerrit-Change-Number: 31329 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Feb 2023 15:11:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmocom-bb[master]: l1ctl_proto.h: rework GPRS related messages

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31332 ) Change subject: l1ctl_proto.h: rework GPRS related messages ...................................................................... l1ctl_proto.h: rework GPRS related messages Change-Id: I7c9c28e93dc938dfa76d0ab989d0952675e8b78e --- M include/l1ctl_proto.h 1 file changed, 45 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/32/31332/1 diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h index 7e415e9..953abb0 100644 --- a/include/l1ctl_proto.h +++ b/include/l1ctl_proto.h @@ -53,11 +53,10 @@ L1CTL_TRAFFIC_CONF = 0x1d, L1CTL_TRAFFIC_IND = 0x1e, L1CTL_BURST_IND = 0x1f, - /* configure TBF for uplink/downlink */ - L1CTL_TBF_CFG_REQ = 0x20, - L1CTL_TBF_CFG_CONF = 0x21, - L1CTL_DATA_TBF_REQ = 0x22, - L1CTL_DATA_TBF_CONF = 0x23, + L1CTL_GPRS_UL_TBF_CFG_REQ = 0x20, + L1CTL_GPRS_DL_TBF_CFG_REQ = 0x21, + L1CTL_GPRS_UL_BLOCK_REQ = 0x22, + L1CTL_GPRS_DL_BLOCK_IND = 0x23, /* Extended (11-bit) RACH (see 3GPP TS 05.02, section 5.2.7) */ L1CTL_EXT_RACH_REQ = 0x24, }; @@ -372,15 +371,49 @@ uint8_t data[0]; } __attribute__((packed)); -struct l1ctl_tbf_cfg_req { - /* future support for multiple concurrent TBFs. 0 for now */ +/* payload of L1CTL_GPRS_UL_TBF_CFG_REQ */ +struct l1ctl_gprs_ul_tbf_cfg_req { uint8_t tbf_nr; - /* is this about an UL TBF (1) or DL (0) */ - uint8_t is_uplink; - uint8_t padding[2]; + uint8_t tn; + uint8_t active; + uint8_t padding[1]; +} __attribute__((packed)); - /* one USF for each TN, or 255 for invalid/unused */ - uint8_t usf[8]; +/* payload of L1CTL_GPRS_DL_TBF_CFG_REQ */ +struct l1ctl_gprs_dl_tbf_cfg_req { + uint8_t tbf_nr; + uint8_t slotmask; + uint8_t dl_tfi; + uint8_t padding[1]; +} __attribute__((packed)); + +#define L1CTL_GPRS_DL_BLOCK_F_PTCCH (1 << 0) +#define L1CTL_GPRS_DL_BLOCK_F_PART (1 << 1) + +/* part of L1CTL_GPRS_{UL,DL}_BLOCK_{REQ,CONF,IND} */ +struct l1ctl_gprs_block_hdr { + uint32_t fn; + uint8_t tn; + uint8_t flags; /* see L1CTL_GPRS_{UL,DL}_BLOCK_F_* above */ + uint8_t padding[2]; +} __attribute__((packed)); + +/* payload of L1CTL_GPRS_UL_BLOCK_REQ */ +struct l1ctl_gprs_ul_block_req { + struct l1ctl_gprs_block_hdr hdr; + uint8_t data[0]; +} __attribute__((packed)); + +/* payload of L1CTL_GPRS_DL_BLOCK_IND */ +struct l1ctl_gprs_dl_block_ind { + struct l1ctl_gprs_block_hdr hdr; + struct { + uint16_t ber10k; /* Bit Error Rate */ + int16_t ci_cb; /* C/I in centiBels */ + uint8_t rx_lev; /* RxLev 0..63 */ + } meas; + uint8_t usf; + uint8_t data[0]; } __attribute__((packed)); #endif /* __L1CTL_PROTO_H__ */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31332 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7c9c28e93dc938dfa76d0ab989d0952675e8b78e Gerrit-Change-Number: 31332 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in osmocom-bb[master]: l1ctl_proto.h: explicitly assign message type values

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31331 ) Change subject: l1ctl_proto.h: explicitly assign message type values ...................................................................... l1ctl_proto.h: explicitly assign message type values Explicit is better than implicit. Having the message type values assigned explicitly allows rearranging messages in the middle without affecting the message type values following them. Change-Id: I1ec32289a24c5704ea0676b508cb12ee0b4890d7 --- M include/l1ctl_proto.h 1 file changed, 37 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/31/31331/1 diff --git a/include/l1ctl_proto.h b/include/l1ctl_proto.h index a15f905..7e415e9 100644 --- a/include/l1ctl_proto.h +++ b/include/l1ctl_proto.h @@ -21,48 +21,45 @@ #define __L1CTL_PROTO_H__ enum { - _L1CTL_NONE = 0, - L1CTL_FBSB_REQ, - L1CTL_FBSB_CONF, - L1CTL_DATA_IND, - L1CTL_RACH_REQ, - L1CTL_DM_EST_REQ, - L1CTL_DATA_REQ, - L1CTL_RESET_IND, - L1CTL_PM_REQ, /* power measurement */ - L1CTL_PM_CONF, /* power measurement */ - L1CTL_ECHO_REQ, - L1CTL_ECHO_CONF, - L1CTL_RACH_CONF, - L1CTL_RESET_REQ, - L1CTL_RESET_CONF, - L1CTL_DATA_CONF, - L1CTL_CCCH_MODE_REQ, - L1CTL_CCCH_MODE_CONF, - L1CTL_DM_REL_REQ, - L1CTL_PARAM_REQ, - L1CTL_DM_FREQ_REQ, - L1CTL_CRYPTO_REQ, - L1CTL_SIM_REQ, - L1CTL_SIM_CONF, - L1CTL_TCH_MODE_REQ, - L1CTL_TCH_MODE_CONF, - L1CTL_NEIGH_PM_REQ, - L1CTL_NEIGH_PM_IND, - L1CTL_TRAFFIC_REQ, - L1CTL_TRAFFIC_CONF, - L1CTL_TRAFFIC_IND, - L1CTL_BURST_IND, - + _L1CTL_NONE = 0x00, + L1CTL_FBSB_REQ = 0x01, + L1CTL_FBSB_CONF = 0x02, + L1CTL_DATA_IND = 0x03, + L1CTL_RACH_REQ = 0x04, + L1CTL_DM_EST_REQ = 0x05, + L1CTL_DATA_REQ = 0x06, + L1CTL_RESET_IND = 0x07, + L1CTL_PM_REQ = 0x08, /* power measurement */ + L1CTL_PM_CONF = 0x09, /* power measurement */ + L1CTL_ECHO_REQ = 0x0a, + L1CTL_ECHO_CONF = 0x0b, + L1CTL_RACH_CONF = 0x0c, + L1CTL_RESET_REQ = 0x0d, + L1CTL_RESET_CONF = 0x0e, + L1CTL_DATA_CONF = 0x0f, + L1CTL_CCCH_MODE_REQ = 0x10, + L1CTL_CCCH_MODE_CONF = 0x11, + L1CTL_DM_REL_REQ = 0x12, + L1CTL_PARAM_REQ = 0x13, + L1CTL_DM_FREQ_REQ = 0x14, + L1CTL_CRYPTO_REQ = 0x15, + L1CTL_SIM_REQ = 0x16, + L1CTL_SIM_CONF = 0x17, + L1CTL_TCH_MODE_REQ = 0x18, + L1CTL_TCH_MODE_CONF = 0x19, + L1CTL_NEIGH_PM_REQ = 0x1a, + L1CTL_NEIGH_PM_IND = 0x1b, + L1CTL_TRAFFIC_REQ = 0x1c, + L1CTL_TRAFFIC_CONF = 0x1d, + L1CTL_TRAFFIC_IND = 0x1e, + L1CTL_BURST_IND = 0x1f, /* configure TBF for uplink/downlink */ - L1CTL_TBF_CFG_REQ, - L1CTL_TBF_CFG_CONF, - - L1CTL_DATA_TBF_REQ, - L1CTL_DATA_TBF_CONF, - + L1CTL_TBF_CFG_REQ = 0x20, + L1CTL_TBF_CFG_CONF = 0x21, + L1CTL_DATA_TBF_REQ = 0x22, + L1CTL_DATA_TBF_CONF = 0x23, /* Extended (11-bit) RACH (see 3GPP TS 05.02, section 5.2.7) */ - L1CTL_EXT_RACH_REQ, + L1CTL_EXT_RACH_REQ = 0x24, }; enum ccch_mode { -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31331 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1ec32289a24c5704ea0676b508cb12ee0b4890d7 Gerrit-Change-Number: 31331 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: move l1ctl_proto.h to 'include/osmocom/bb/'

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31333 ) Change subject: trxcon: move l1ctl_proto.h to 'include/osmocom/bb/' ...................................................................... trxcon: move l1ctl_proto.h to 'include/osmocom/bb/' The upcoming l1gprs library will be using this header too. Change-Id: I2101b20637f837038115497873bd905f95a3d0c2 --- M src/host/trxcon/include/osmocom/bb/Makefile.am A src/host/trxcon/include/osmocom/bb/l1ctl_proto.h M src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am D src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h M src/host/trxcon/src/l1ctl.c 5 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/33/31333/1 diff --git a/src/host/trxcon/include/osmocom/bb/Makefile.am b/src/host/trxcon/include/osmocom/bb/Makefile.am index c26db00..127a2c7 100644 --- a/src/host/trxcon/include/osmocom/bb/Makefile.am +++ b/src/host/trxcon/include/osmocom/bb/Makefile.am @@ -2,3 +2,7 @@ l1sched \ trxcon \ $(NULL) + +noinst_HEADERS = \ + l1ctl_proto.h \ + $(NULL) diff --git a/src/host/trxcon/include/osmocom/bb/l1ctl_proto.h b/src/host/trxcon/include/osmocom/bb/l1ctl_proto.h new file mode 120000 index 0000000..ee19b80 --- /dev/null +++ b/src/host/trxcon/include/osmocom/bb/l1ctl_proto.h @@ -0,0 +1 @@ +../../../../../../include/l1ctl_proto.h \ No newline at end of file diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am index bd9324a..ad1e89a 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am +++ b/src/host/trxcon/include/osmocom/bb/trxcon/Makefile.am @@ -1,5 +1,4 @@ noinst_HEADERS = \ - l1ctl_proto.h \ l1ctl_server.h \ l1ctl.h \ phyif.h \ diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h deleted file mode 120000 index 7ab0f41..0000000 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_proto.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../include/l1ctl_proto.h \ No newline at end of file diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index b0516cd..ec98f82 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -39,8 +39,8 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/protocol/gsm_08_58.h> +#include <osmocom/bb/l1ctl_proto.h> #include <osmocom/bb/trxcon/logging.h> -#include <osmocom/bb/trxcon/l1ctl_proto.h> #include <osmocom/bb/trxcon/trxcon.h> #include <osmocom/bb/trxcon/trxcon_fsm.h> -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2101b20637f837038115497873bd905f95a3d0c2 Gerrit-Change-Number: 31333 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in osmo-pcu[master]: lc15/oc2g: fix function signature of l1if_open_pdch()

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31330 ) Change subject: lc15/oc2g: fix function signature of l1if_open_pdch() ...................................................................... lc15/oc2g: fix function signature of l1if_open_pdch() The function signatures l1if_open_pdch() in the code for lc15 and oc2g differ from what is defined in pcu_l1_if_phy.h. Lets update the signatures so that they match the prototype. Related: OS#5198 Change-Id: If1693b1b74c1808596d7da639b860f7b226385c0 --- M src/osmo-bts-litecell15/lc15_l1_if.c M src/osmo-bts-oc2g/oc2g_l1_if.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/30/31330/1 diff --git a/src/osmo-bts-litecell15/lc15_l1_if.c b/src/osmo-bts-litecell15/lc15_l1_if.c index 13e0fc9..c1b9b71 100644 --- a/src/osmo-bts-litecell15/lc15_l1_if.c +++ b/src/osmo-bts-litecell15/lc15_l1_if.c @@ -361,7 +361,7 @@ return 0; } -void *l1if_open_pdch(uint8_t trx_no, uint32_t hlayer1) +void *l1if_open_pdch(uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap) { struct lc15l1_hdl *fl1h; int rc; diff --git a/src/osmo-bts-oc2g/oc2g_l1_if.c b/src/osmo-bts-oc2g/oc2g_l1_if.c index a41e7af..dae5908 100644 --- a/src/osmo-bts-oc2g/oc2g_l1_if.c +++ b/src/osmo-bts-oc2g/oc2g_l1_if.c @@ -366,7 +366,7 @@ return 0; } -void *l1if_open_pdch(uint8_t trx_no, uint32_t hlayer1) +void *l1if_open_pdch(uint8_t trx_no, uint32_t hlayer1, struct gsmtap_inst *gsmtap) { struct oc2gl1_hdl *fl1h; int rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31330 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If1693b1b74c1808596d7da639b860f7b226385c0 Gerrit-Change-Number: 31330 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in osmo-pcu[master]: osmo-bts-xyz: include pcu_l1_if_phy.h in phy in l1_if code

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31329 ) Change subject: osmo-bts-xyz: include pcu_l1_if_phy.h in phy in l1_if code ...................................................................... osmo-bts-xyz: include pcu_l1_if_phy.h in phy in l1_if code The file pcu_l1_if_phy.h contains the function prototypes for the implementations found in xyz_l1_if.c. Lets also include pcu_l1_if_phy.h in the related .c files. Change-Id: Id35ba473973108da4e36d5c6f2ca78da1225ae8b Related: OS#5198 --- M src/osmo-bts-litecell15/lc15_l1_if.c M src/osmo-bts-oc2g/oc2g_l1_if.c M src/osmo-bts-sysmo/sysmo_l1_if.c 3 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/29/31329/1 diff --git a/src/osmo-bts-litecell15/lc15_l1_if.c b/src/osmo-bts-litecell15/lc15_l1_if.c index 13e0fc9..045bc5d 100644 --- a/src/osmo-bts-litecell15/lc15_l1_if.c +++ b/src/osmo-bts-litecell15/lc15_l1_if.c @@ -34,6 +34,7 @@ #include <lc15_l1_if.h> #include <gprs_debug.h> #include <pcu_l1_if.h> +#include <pcu_l1_if_phy.h> #include <pdch.h> #include <bts.h> diff --git a/src/osmo-bts-oc2g/oc2g_l1_if.c b/src/osmo-bts-oc2g/oc2g_l1_if.c index a41e7af..1bcc65d 100644 --- a/src/osmo-bts-oc2g/oc2g_l1_if.c +++ b/src/osmo-bts-oc2g/oc2g_l1_if.c @@ -35,6 +35,7 @@ #include <gprs_debug.h> #include <pcu_l1_if.h> +#include <pcu_l1_if_phy.h> #include <osmocom/pcu/pcuif_proto.h> #include <bts.h> diff --git a/src/osmo-bts-sysmo/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c index f8b10cd..31028f5 100644 --- a/src/osmo-bts-sysmo/sysmo_l1_if.c +++ b/src/osmo-bts-sysmo/sysmo_l1_if.c @@ -15,6 +15,7 @@ #include <sysmo_l1_if.h> #include <gprs_debug.h> #include <pcu_l1_if.h> +#include <pcu_l1_if_phy.h> #include <pdch.h> #include <bts.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31329 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id35ba473973108da4e36d5c6f2ca78da1225ae8b Gerrit-Change-Number: 31329 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in libosmo-sccp[master]: SS7: do not attempt transfer if AS is down

by msuraev

Attention is currently required from: neels, laforge, pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 ) Change subject: SS7: do not attempt transfer if AS is down ...................................................................... Patch Set 3: (1 comment) File src/osmo_ss7.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/31295/comment/ecd0f970_cf5ffefb PS3, Line 1153: if (!as->fi) > this needs to be removed ow that there's the assert. The assert checks for as, not as->fi. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0d5f3b6265e7fdaa79e32fbc30f829ef79e7dad1 Gerrit-Change-Number: 31295 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Feb 2023 14:04:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in libosmocore[master]: socket: propagate error in osmo_sock_unix_init() to the caller

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31299 ) Change subject: socket: propagate error in osmo_sock_unix_init() to the caller ...................................................................... socket: propagate error in osmo_sock_unix_init() to the caller Change-Id: Ia90d2ca3106b58dc5953d930f13df829d5b6966f --- M src/core/socket.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/core/socket.c b/src/core/socket.c index 43736e0..9e0f84e 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -249,7 +249,7 @@ if (rc < 0) { LOGP(DLGLOBAL, LOGL_ERROR, "unable to listen on socket: %s\n", strerror(errno)); - return rc; + return -errno; } break; } @@ -1393,7 +1393,7 @@ sfd = socket(AF_UNIX, type, proto); if (sfd < 0) - return -1; + return -errno; if (flags & OSMO_SOCK_F_CONNECT) { rc = connect(sfd, (struct sockaddr *)&local, namelen); @@ -1413,13 +1413,13 @@ rc = osmo_sock_init_tail(sfd, type, flags); if (rc < 0) { close(sfd); - sfd = -1; + sfd = rc; } return sfd; err: close(sfd); - return -1; + return -errno; } /*! Initialize a unix domain socket and fill \ref osmo_fd -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia90d2ca3106b58dc5953d930f13df829d5b6966f Gerrit-Change-Number: 31299 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

Change in libosmocore[master]: socket: propagate error in osmo_sock_unix_init() to the caller

by msuraev

Attention is currently required from: neels. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31299 ) Change subject: socket: propagate error in osmo_sock_unix_init() to the caller ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31299 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia90d2ca3106b58dc5953d930f13df829d5b6966f Gerrit-Change-Number: 31299 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 Feb 2023 14:02:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023