November 2022 - gerrit-log - lists.osmocom.org

Change in libosmo-sccp[master]: Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-def...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/29989 ) Change subject: Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition ...................................................................... Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition ... if --enable-werror is used Change-Id: If344ef88121111db5365b8cee3cf3cd1283303c1 --- M configure.ac 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/configure.ac b/configure.ac index fe9f614..98f1799 100644 --- a/configure.ac +++ b/configure.ac @@ -77,6 +77,7 @@ then WERROR_FLAGS="-Werror" WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" + WERROR_FLAGS+=" -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition" WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" CFLAGS="$CFLAGS $WERROR_FLAGS" CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/29989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: If344ef88121111db5365b8cee3cf3cd1283303c1 Gerrit-Change-Number: 29989 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-hlr[master]: Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-def...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/29990 ) Change subject: Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition ...................................................................... Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition ... if --enable-werror is used Change-Id: Id465254bf12eb84acb116c86711a5b52b4d3ad35 --- M configure.ac 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/configure.ac b/configure.ac index 8823288..78d0af9 100644 --- a/configure.ac +++ b/configure.ac @@ -93,6 +93,7 @@ if test x"$werror" = x"yes" then WERROR_FLAGS="-Werror" + WERROR_FLAGS+=" -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition" WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" CFLAGS="$CFLAGS $WERROR_FLAGS" -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/29990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Id465254bf12eb84acb116c86711a5b52b4d3ad35 Gerrit-Change-Number: 29990 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-mgw[master]: Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-def...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29991 ) Change subject: Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition ...................................................................... Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition ... if --enable-werror is used Change-Id: Ib397f3ad748e17f20b6177ef706af65088571f70 --- M configure.ac 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 1604c88..017d78c 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,7 @@ if test x"$werror" = x"yes" then WERROR_FLAGS="-Werror" + WERROR_FLAGS+=" -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition" WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" CFLAGS="$CFLAGS $WERROR_FLAGS" -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ib397f3ad748e17f20b6177ef706af65088571f70 Gerrit-Change-Number: 29991 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-bsc[master]: Support building with -Werror=strict-prototypes / -Werror=old-style-d...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29982 ) Change subject: Support building with -Werror=strict-prototypes / -Werror=old-style-definition ...................................................................... Support building with -Werror=strict-prototypes / -Werror=old-style-definition Unfortunately "-std=c99" is not sufficient to make gcc ignore cold that uses constructs of earlier C standards, which were abandoned in C99. See https://lwn.net/ml/fedora-devel/Y1kvF35WozzGBpc8@redhat.com/ for some related discussion. Change-Id: Ic92aa70d569778a776f4c5d24c455f71fd50b61b --- M include/osmocom/bsc/assignment_fsm.h M include/osmocom/bsc/bsc_stats.h M include/osmocom/bsc/bsc_subscr_conn_fsm.h M include/osmocom/bsc/chan_counts.h M include/osmocom/bsc/handover_fsm.h M include/osmocom/bsc/handover_vty.h M include/osmocom/bsc/lb.h M include/osmocom/bsc/lchan_fsm.h M include/osmocom/bsc/neighbor_ident.h M include/osmocom/bsc/osmo_bsc.h M src/ipaccess/abisip-find.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_stats.c M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/bssmap_reset.c M src/osmo-bsc/chan_counts.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/handover_vty.c M src/osmo-bsc/lb.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/neighbor_ident.c M src/osmo-bsc/neighbor_ident_vty.c M src/osmo-bsc/osmo_bsc_main.c 24 files changed, 41 insertions(+), 40 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/assignment_fsm.h b/include/osmocom/bsc/assignment_fsm.h index 98bec42..3dffaf2 100644 --- a/include/osmocom/bsc/assignment_fsm.h +++ b/include/osmocom/bsc/assignment_fsm.h @@ -40,7 +40,7 @@ ASSIGNMENT_EV_CONN_RELEASING, }; -void assignment_fsm_init(); +void assignment_fsm_init(void); int reassignment_request_to_lchan(enum assign_for assign_for, struct gsm_lchan *lchan, struct gsm_lchan *to_lchan, int tsc_set, int tsc); diff --git a/include/osmocom/bsc/bsc_stats.h b/include/osmocom/bsc/bsc_stats.h index e8837aa..eae9750 100644 --- a/include/osmocom/bsc/bsc_stats.h +++ b/include/osmocom/bsc/bsc_stats.h @@ -113,4 +113,4 @@ void bsc_update_connection_stats(struct gsm_network *net); void all_allocated_update_bts(struct gsm_bts *bts); -void all_allocated_update_bsc(); +void all_allocated_update_bsc(void); diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h index 0ab4843..b358da6 100644 --- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h +++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h @@ -57,7 +57,7 @@ struct assignment_request; struct gsm_lchan; -void bsc_subscr_conn_fsm_init(); +void bsc_subscr_conn_fsm_init(void); /* Allocate a subscriber connection and its associated FSM */ struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net); diff --git a/include/osmocom/bsc/chan_counts.h b/include/osmocom/bsc/chan_counts.h index c11473e..a830e87 100644 --- a/include/osmocom/bsc/chan_counts.h +++ b/include/osmocom/bsc/chan_counts.h @@ -6,11 +6,11 @@ struct gsm_bts_trx_ts; struct gsm_lchan; -void chan_counts_sig_init(); +void chan_counts_sig_init(void); void chan_counts_ts_update(struct gsm_bts_trx_ts *ts); void chan_counts_ts_clear(struct gsm_bts_trx_ts *ts); void chan_counts_trx_update(struct gsm_bts_trx *trx); -void chan_counts_bsc_verify(); +void chan_counts_bsc_verify(void); /* First array index to chan_counts.val. */ enum chan_counts_dim1 { diff --git a/include/osmocom/bsc/handover_fsm.h b/include/osmocom/bsc/handover_fsm.h index 052e09d..faec73f 100644 --- a/include/osmocom/bsc/handover_fsm.h +++ b/include/osmocom/bsc/handover_fsm.h @@ -55,7 +55,7 @@ const uint8_t *access_delay; }; -void handover_fsm_init(); +void handover_fsm_init(void); int handover_request(struct handover_out_req *req); void handover_start(struct handover_out_req *req); diff --git a/include/osmocom/bsc/handover_vty.h b/include/osmocom/bsc/handover_vty.h index 6ad5276..1dd8bf0 100644 --- a/include/osmocom/bsc/handover_vty.h +++ b/include/osmocom/bsc/handover_vty.h @@ -3,6 +3,6 @@ #include <osmocom/vty/vty.h> #include <osmocom/bsc/handover_cfg.h> -void ho_vty_init(); +void ho_vty_init(void); void ho_vty_write_net(struct vty *vty, struct gsm_network *net); void ho_vty_write_bts(struct vty *vty, struct gsm_bts *bts); diff --git a/include/osmocom/bsc/lb.h b/include/osmocom/bsc/lb.h index dbea0b0..08206d4 100644 --- a/include/osmocom/bsc/lb.h +++ b/include/osmocom/bsc/lb.h @@ -57,7 +57,7 @@ extern const struct rate_ctr_desc smlc_ctr_description[]; extern const struct rate_ctr_group_desc smlc_ctrg_desc; -int lb_init(); -int lb_start_or_stop(); +int lb_init(void); +int lb_start_or_stop(void); int lb_send(struct gsm_subscriber_connection *conn, const struct bssap_le_pdu *bssap_le); void lb_close_conn(struct gsm_subscriber_connection *conn); diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index b9ffb22..cc231dc 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -56,7 +56,7 @@ LCHAN_EV_REQUEST_MODE_MODIFY, }; -void lchan_fsm_init(); +void lchan_fsm_init(void); void lchan_fsm_alloc(struct gsm_lchan *lchan); void lchan_release(struct gsm_lchan *lchan, bool do_rr_release, diff --git a/include/osmocom/bsc/neighbor_ident.h b/include/osmocom/bsc/neighbor_ident.h index c6a2c42..bd14bd4 100644 --- a/include/osmocom/bsc/neighbor_ident.h +++ b/include/osmocom/bsc/neighbor_ident.h @@ -73,7 +73,7 @@ int resolve_neighbors(struct gsm_bts **local_neighbor_p, struct gsm0808_cell_id_list2 *remote_neighbors, struct gsm_bts *from_bts, const struct cell_ab *target_ab, bool log_errors); -void neighbor_ident_vty_init(); +void neighbor_ident_vty_init(void); void neighbor_ident_vty_write_bts(struct vty *vty, const char *indent, struct gsm_bts *bts); void neighbor_ident_vty_write_network(struct vty *vty, const char *indent); @@ -81,7 +81,7 @@ int neighbor_ident_del_neighbor(struct vty *vty, struct gsm_bts *bts, struct neighbor *n); int neighbor_ident_ctrl_init(void); -int neighbors_check_cfg(); +int neighbors_check_cfg(void); #define CELL_AB_VTY_PARAMS "arfcn <0-1023> bsic (<0-63>|any)" #define CELL_AB_VTY_DOC \ diff --git a/include/osmocom/bsc/osmo_bsc.h b/include/osmocom/bsc/osmo_bsc.h index 13ccdd7..ee8cc13 100644 --- a/include/osmocom/bsc/osmo_bsc.h +++ b/include/osmocom/bsc/osmo_bsc.h @@ -17,7 +17,7 @@ struct gsm_subscriber_connection; struct gsm_bts; -struct bsc_api *osmo_bsc_api(); +struct bsc_api *osmo_bsc_api(void); int bsc_scan_bts_msg(struct gsm_subscriber_connection *conn, struct msgb *msg); int bsc_scan_msc_msg(struct gsm_subscriber_connection *conn, struct msgb *msg); @@ -25,7 +25,8 @@ int bsc_handle_udt(struct bsc_msc_data *msc, struct msgb *msg, unsigned int length); int bsc_handle_dt(struct gsm_subscriber_connection *conn, struct msgb *msg, unsigned int len); -int bsc_ctrl_cmds_install(); +struct gsm_network; +int bsc_ctrl_cmds_install(struct gsm_network *net); void bsc_gen_location_state_trap(struct gsm_bts *bts); diff --git a/src/ipaccess/abisip-find.c b/src/ipaccess/abisip-find.c index 4bba8a3..a26bb55 100644 --- a/src/ipaccess/abisip-find.c +++ b/src/ipaccess/abisip-find.c @@ -53,7 +53,7 @@ .format_json = false, }; -static void print_help() +static void print_help(void) { printf("\n"); printf("Usage: abisip-find [-l] [<interface-name>]\n"); @@ -265,7 +265,7 @@ void *ctx = NULL; -void print_timestamp() +void print_timestamp(void) { time_t now = time(NULL); printf("\n\n----- %s\n", ctime(&now)); @@ -304,7 +304,7 @@ return true; } -bool base_stations_timeout() +bool base_stations_timeout(void) { struct base_station *bs, *next_bs; time_t now = time(NULL); @@ -323,7 +323,7 @@ return changed; } -void base_stations_print() +void base_stations_print(void) { struct base_station *bs; int count = 0; diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 7ca17c6..fff7e59 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -364,7 +364,7 @@ } } -void assignment_fsm_init() +void assignment_fsm_init(void) { OSMO_ASSERT(osmo_fsm_register(&assignment_fsm) == 0); } diff --git a/src/osmo-bsc/bsc_stats.c b/src/osmo-bsc/bsc_stats.c index e8c39be..ce30720 100644 --- a/src/osmo-bsc/bsc_stats.c +++ b/src/osmo-bsc/bsc_stats.c @@ -229,7 +229,7 @@ all_allocated_update(&bts->all_allocated, &bts->chan_counts); } -void all_allocated_update_bsc() +void all_allocated_update_bsc(void) { struct gsm_network *net = bsc_gsmnet; all_allocated_update(&net->all_allocated, &net->chan_counts); diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index baa54e0..a19be0c 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -1202,7 +1202,7 @@ .event_names = gscon_fsm_event_names, }; -void bsc_subscr_conn_fsm_init() +void bsc_subscr_conn_fsm_init(void) { OSMO_ASSERT(osmo_fsm_register(&gscon_fsm) == 0); OSMO_ASSERT(osmo_fsm_register(&lcls_fsm) == 0); diff --git a/src/osmo-bsc/bssmap_reset.c b/src/osmo-bsc/bssmap_reset.c index 30fc02e..fa6684d 100644 --- a/src/osmo-bsc/bssmap_reset.c +++ b/src/osmo-bsc/bssmap_reset.c @@ -251,7 +251,7 @@ osmo_fsm_inst_state_chg_ms(bssmap_reset->fi, BSSMAP_RESET_ST_DISC, 1, 0); } -static __attribute__((constructor)) void bssmap_reset_fsm_init() +static __attribute__((constructor)) void bssmap_reset_fsm_init(void) { OSMO_ASSERT(osmo_fsm_register(&bssmap_reset_fsm) == 0); } diff --git a/src/osmo-bsc/chan_counts.c b/src/osmo-bsc/chan_counts.c index a863178..bf86368 100644 --- a/src/osmo-bsc/chan_counts.c +++ b/src/osmo-bsc/chan_counts.c @@ -248,7 +248,7 @@ osmo_signal_register_handler(SS_NM, chan_counts_sig_cb, NULL); } -void chan_counts_bsc_verify() +void chan_counts_bsc_verify(void) { struct gsm_bts *bts; struct chan_counts bsc_counts = {0}; diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 92e8c6e..0d888e0 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -293,7 +293,7 @@ }; } -void handover_fsm_init() +void handover_fsm_init(void) { OSMO_ASSERT(osmo_fsm_register(&ho_fsm) == 0); } diff --git a/src/osmo-bsc/handover_vty.c b/src/osmo-bsc/handover_vty.c index e5435f5..afc12d9 100644 --- a/src/osmo-bsc/handover_vty.c +++ b/src/osmo-bsc/handover_vty.c @@ -170,7 +170,7 @@ #undef HO_CFG_ONE_MEMBER } -void ho_vty_init() +void ho_vty_init(void) { ho_vty_init_cmds(GSMNET_NODE); install_element(GSMNET_NODE, &cfg_net_ho_congestion_check_interval_cmd); diff --git a/src/osmo-bsc/lb.c b/src/osmo-bsc/lb.c index 276b0a1..6f3cfac 100644 --- a/src/osmo-bsc/lb.c +++ b/src/osmo-bsc/lb.c @@ -46,7 +46,7 @@ } /* Send reset to SMLC */ -int bssmap_le_tx_reset() +int bssmap_le_tx_reset(void) { struct osmo_ss7_instance *ss7; struct msgb *msg; @@ -74,7 +74,7 @@ } /* Send reset-ack to SMLC */ -int bssmap_le_tx_reset_ack() +int bssmap_le_tx_reset_ack(void) { struct osmo_ss7_instance *ss7; struct msgb *msg; @@ -352,7 +352,7 @@ #define DEFAULT_ASP_LOCAL_IP "localhost" #define DEFAULT_ASP_REMOTE_IP "localhost" -void lb_cancel_all() +void lb_cancel_all(void) { struct gsm_subscriber_connection *conn; llist_for_each_entry(conn, &bsc_gsmnet->subscr_conns, entry) @@ -384,7 +384,7 @@ bssmap_le_tx_reset_ack(); } -static void lb_start_reset_fsm() +static void lb_start_reset_fsm(void) { struct bssmap_reset_cfg cfg = { .conn_cfm_failure_threshold = 3, @@ -404,13 +404,13 @@ bsc_gsmnet->smlc->bssmap_reset = bssmap_reset_alloc(bsc_gsmnet, "Lb", &cfg); } -static void lb_stop_reset_fsm() +static void lb_stop_reset_fsm(void) { bssmap_reset_term_and_free(bsc_gsmnet->smlc->bssmap_reset); bsc_gsmnet->smlc->bssmap_reset = NULL; } -static int lb_start() +static int lb_start(void) { uint32_t default_pc; struct osmo_ss7_instance *cs7_inst = NULL; @@ -484,7 +484,7 @@ return 0; } -static int lb_stop() +static int lb_stop(void) { /* Not set up? */ if (!bsc_gsmnet->smlc->sccp_user) @@ -499,7 +499,7 @@ return 0; } -int lb_start_or_stop() +int lb_start_or_stop(void) { int rc; if (bsc_gsmnet->smlc->enable) { @@ -534,7 +534,7 @@ static void smlc_vty_init(void); -int lb_init() +int lb_init(void) { OSMO_ASSERT(!bsc_gsmnet->smlc); bsc_gsmnet->smlc = talloc_zero(bsc_gsmnet, struct smlc_config); diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 21e145b..b1cef5d 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -463,7 +463,7 @@ extern void lchan_rtp_fsm_init(); -void lchan_fsm_init() +void lchan_fsm_init(void) { OSMO_ASSERT(osmo_fsm_register(&lchan_fsm) == 0); lchan_rtp_fsm_init(); diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 466b168..0791619 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -70,7 +70,7 @@ } while (0) /* Called from lchan_fsm_init(), does not need to be visible in lchan_rtp_fsm.h */ -void lchan_rtp_fsm_init() +void lchan_rtp_fsm_init(void) { OSMO_ASSERT(osmo_fsm_register(&lchan_rtp_fsm) == 0); } diff --git a/src/osmo-bsc/neighbor_ident.c b/src/osmo-bsc/neighbor_ident.c index 44b0b43..e41a4b2 100644 --- a/src/osmo-bsc/neighbor_ident.c +++ b/src/osmo-bsc/neighbor_ident.c @@ -293,7 +293,7 @@ return true; } -int neighbors_check_cfg() +int neighbors_check_cfg(void) { /* A local neighbor can be configured by BTS number, or by a cell ID. A local neighbor can omit the ARFCN+BSIC, * in which case those are taken from that local BTS config. If a local neighbor has ARFCN+BSIC configured, it diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index 86adbf2..7e58e37 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -628,7 +628,7 @@ return CMD_SUCCESS; } -void neighbor_ident_vty_init() +void neighbor_ident_vty_init(void) { install_element(GSMNET_NODE, &cfg_neighbor_bind_cmd); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index dd8e696..c85f1c4 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -91,12 +91,12 @@ static const char *rf_ctrl = NULL; static int daemonize = 0; -static void print_usage() +static void print_usage(void) { printf("Usage: osmo-bsc\n"); } -static void print_help() +static void print_help(void) { printf("Some useful options:\n"); printf(" -h --help This text.\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic92aa70d569778a776f4c5d24c455f71fd50b61b Gerrit-Change-Number: 29982 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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

2 years, 7 months

1
0
0 0

Change in libsmpp34[master]: Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-def...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libsmpp34/+/29988 ) Change subject: Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition ...................................................................... Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition ... if --enable-werror is used Change-Id: I42f0ef1c9eea62a2512a15543ff45d776155fdc5 --- M configure.ac 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index fce48b4..9454953 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,7 @@ if test x"$werror" = x"yes" then WERROR_FLAGS="-Werror" + WERROR_FLAGS+=" -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition" WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" CFLAGS="$CFLAGS $WERROR_FLAGS" -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/29988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: I42f0ef1c9eea62a2512a15543ff45d776155fdc5 Gerrit-Change-Number: 29988 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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

2 years, 7 months

1
0
0 0

Change in libosmocore[master]: Fix typos in copyright statements.

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30067 ) Change subject: Fix typos in copyright statements. ...................................................................... Fix typos in copyright statements. Change-Id: I783c56bb1d216ce3a47a19da230ee5f50aca2ab3 --- M src/context.c M src/mnl.c M src/select.c 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/context.c b/src/context.c index 8ab6f87..6b58565 100644 --- a/src/context.c +++ b/src/context.c @@ -2,7 +2,7 @@ * talloc context handling. * * (C) 2019 by Harald Welte <laforge(a)gnumonks.org> - * All Rights Reserverd. + * All Rights Reserved. * * SPDX-License-Identifier: GPL-2.0+ * diff --git a/src/mnl.c b/src/mnl.c index f32367d..c3f5fe6 100644 --- a/src/mnl.c +++ b/src/mnl.c @@ -8,7 +8,7 @@ /* * (C) 2020 by Harald Welte <laforge(a)gnumonks.org> - * All Rights Reserverd. + * All Rights Reserved. * * SPDX-License-Identifier: GPL-2.0+ * diff --git a/src/select.c b/src/select.c index 5aee7d8..026d457 100644 --- a/src/select.c +++ b/src/select.c @@ -5,7 +5,7 @@ * of the linux 2.4 netfilter subsystem. */ /* * (C) 2000-2020 by Harald Welte <laforge(a)gnumonks.org> - * All Rights Reserverd. + * All Rights Reserved. * * SPDX-License-Identifier: GPL-2.0+ * -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I783c56bb1d216ce3a47a19da230ee5f50aca2ab3 Gerrit-Change-Number: 30067 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-e1d[master]: DAHDI trunkdev support

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30068 ) Change subject: DAHDI trunkdev support ...................................................................... Patch Set 1: (3 comments) File src/dahdi_trunkdev.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-853): https://gerrit.osmocom.org/c/osmo-e1d/+/30068/comment/7bf0567f_99c02522 PS1, Line 21: * with this program; if not, write to the Free Software Foundation, Inc., Do not include the paragraph about writing to the Free Software Foundation's mailing address from the sample GPL notice. The FSF has changed addresses in the past, and may do so again. This Osmocom project should already include a copy of the (A)GPL. Robot Comment from checkpatch (run ID jenkins-gerrit-lint-853): https://gerrit.osmocom.org/c/osmo-e1d/+/30068/comment/2227239d_d8d1ec3a PS1, Line 22: * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Do not include the paragraph about writing to the Free Software Foundation's mailing address from the sample GPL notice. The FSF has changed addresses in the past, and may do so again. This Osmocom project should already include a copy of the (A)GPL. Robot Comment from checkpatch (run ID jenkins-gerrit-lint-853): https://gerrit.osmocom.org/c/osmo-e1d/+/30068/comment/ab1e91f8_f93725c3 PS1, Line 51: strncpy(td_o.name, name, sizeof(td_o.name)); Instead of strncpy()/strcpy(), use osmo_strlcpy() or OSMO_STRLCPY_ARRAY() -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib15a7313fcd63e1ed9f2f5b349df967bc4335ec2 Gerrit-Change-Number: 30068 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 10 Nov 2022 00:24:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-e1d[master]: DAHDI trunkdev support

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30068 ) Change subject: DAHDI trunkdev support ...................................................................... DAHDI trunkdev support DAHDI trunkdev is a newly-introduced 'virtual trunk' character device which is used instead of a real hardware driver. This means that an application (such as osmo-e1d) can implement a virtual E1 trunk and receive and transmit E1 frame data which is exposed to DAHDI users just like the data from a real physical E1 span. In order to build DAHDI trunkdev support into osmo-e1d, you will need a special fork of dahdi containing the required support, currently the laforge/trunkdev branch of the following repository: https://gitea.osmocom.org/retronetworking/dahdi-linux Change-Id: Ib15a7313fcd63e1ed9f2f5b349df967bc4335ec2 --- M include/osmocom/octoi/octoi.h M src/Makefile.am A src/dahdi_trunkdev.c M src/e1d.h M src/e1oip.c M src/intf_line.c M src/log.c M src/log.h M src/octoi/octoi.c M src/octoi/octoi_clnt_vty.c M src/octoi/octoi_srv_fsm.c M src/octoi/octoi_srv_vty.c M src/octoi/octoi_vty.h M src/vty.c 14 files changed, 453 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/68/30068/1 diff --git a/include/osmocom/octoi/octoi.h b/include/osmocom/octoi/octoi.h index c9fa3d5..fddee41 100644 --- a/include/osmocom/octoi/octoi.h +++ b/include/osmocom/octoi/octoi.h @@ -11,7 +11,7 @@ ACCOUNT_MODE_NONE, ACCOUNT_MODE_ICE1USB, ACCOUNT_MODE_REDIRECT, - ACCOUNT_MODE_DAHDI, + ACCOUNT_MODE_DAHDI_TRUNKDEV, }; extern const struct value_string octoi_account_mode_name[]; @@ -32,8 +32,9 @@ struct osmo_sockaddr_str to; /* remote IP/port to which to redirect */ } redirect; struct { - /* TBD */ - } dahdi; + char *name; /* DAHDI trunkdev name */ + uint8_t line_nr; /* line number inside icE1usb */ + } dahdi_trunkdev; } u; }; @@ -71,6 +72,8 @@ struct octoi_account *acc); /* OCTOI library notifies the application that a given peer has disconnected */ void (*peer_disconnected)(struct octoi_peer *peer); + /* OCTOI library notifies the application that a given client has been updated */ + void (*client_updated)(struct octoi_client *client); }; struct octoi_daemon { diff --git a/src/Makefile.am b/src/Makefile.am index 2cc8a8f..e807ab9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,6 +48,7 @@ osmo-e1d.c \ usb.c \ vpair.c \ + dahdi_trunkdev.c \ vty.c \ e1oip.c \ $(NULL) @@ -74,5 +75,6 @@ e1gen/osmo_e1f.c \ osmo-e1gen.c \ usb.c \ + dahdi_trunkdev.c \ vty.c \ $(NULL) diff --git a/src/dahdi_trunkdev.c b/src/dahdi_trunkdev.c new file mode 100644 index 0000000..e688b9a --- /dev/null +++ b/src/dahdi_trunkdev.c @@ -0,0 +1,238 @@ +/* + * trunkdev.c + * + * (C) 2022 by Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <errno.h> +#include <unistd.h> +#include <stdint.h> +#include <string.h> +#include <talloc.h> +#include <fcntl.h> + +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/ioctl.h> + +#include <osmocom/core/utils.h> + +#include <dahdi/user.h> + +#include "e1d.h" +#include "log.h" + +/*********************************************************************** + * low-level trunkdev routines + ***********************************************************************/ + +static int trunkdev_specify(int fd, const char *name) +{ + struct dahdi_trunkdev_open td_o = { 0 }; + + strncpy(td_o.name, name, sizeof(td_o.name)); + td_o.name[sizeof(td_o.name)-1] = 0; + + return ioctl(fd, DAHDI_TRUNKDEV_OPEN, &td_o); +} + +/*********************************************************************** + * osmo-e1d interface + ***********************************************************************/ + +/* default dahdi chunk size: 8 chunks (in this case E1 frames) per read/write */ +#define DAHDI_CHUNKSIZE 8 +#define BYTES_PER_FRAME 32 + +/* one E1 line (DAHDI span) inside the trunkdev */ +struct e1_trunkdev_line_data { + unsigned int basechan; /* so far, only 0 supported */ + unsigned int numchans; /* so far, onlt 32 supported */ +}; + +/* one DAHDI trunkdev */ +struct e1_trunkdev_intf_data { + /* file descriptor to the character device /dev/dahdi/trunkdev */ + struct osmo_fd ofd; +}; + +/* file-descriptor call-back. Triggered by DAHDI via poll(), whenever + * there is new E1 frame data available to read from trunkdev. The flow + * control in transmit side is simple: We write as * many frames as we are reading */ +static int dahdi_trunkdev_fd_cb(struct osmo_fd *ofd, unsigned int what) +{ + struct e1_intf *e1i = ofd->data; + struct e1_line *e1l = e1_intf_find_line(e1i, 0); + uint8_t buf[DAHDI_CHUNKSIZE*BYTES_PER_FRAME]; + int rc, len; + + OSMO_ASSERT(what & OSMO_FD_READ); + + len = read(ofd->fd, buf, sizeof(buf)); + if (len <= 0) { + LOGPIF(e1i, DTRUNK, LOGL_ERROR, "Error %d during trunkdev read: %s\n", len, + strerror(errno)); + return len; + } else if (len < (int) sizeof(buf)) { + /* for some not yet known reason this happens quite often, typically 244 of 256 bytes, + * followed by the remaining 32 bytes in the next read. No data is lost, it just + * costs a lot of extra syscalls / context switches */ + LOGPIF(e1i, DTRUNK, LOGL_DEBUG, "Short read during trunkdev read: %d < %zu\n", + len, sizeof(buf)); + } + if (len % BYTES_PER_FRAME) { + LOGPIF(e1i, DTRUNK, LOGL_ERROR, "Odd number of bytes during read: %d\n", len); + return -EIO; + } + + if (!e1l) { + /* no line: discard input; transmit all-ff (BLUE) */ + memset(buf, 0xff, len); + } else { + /* DAHDI trunkdev currently only supports one span/line per trunk */ + rc = e1_line_demux_in(e1l, buf, len, -1); +#if 0 + if (rc < 0) { + LOGPLI(e1l, DTRUNK, LOGL_ERROR, "Error %d during e1_line_demux_in()\n", rc); + return rc; + } +#endif + /* only pull as many frames out of our muxer as we have just read from the trunk */ + len = e1_line_mux_out(e1l, buf, len/BYTES_PER_FRAME); + if (len < 0) { + LOGPLI(e1l, DTRUNK, LOGL_ERROR, "Error %d during mux_out\n", len); + return len; + } + } + + rc = write(ofd->fd, buf, len); + if (rc <= 0) { + LOGPIF(e1i, DTRUNK, LOGL_ERROR, "Error %d during trunkdev write: %s\n", rc, + strerror(errno)); + return rc; + } else if (rc < len) { + LOGPIF(e1i, DTRUNK, LOGL_ERROR, "Short write during trunkdev write: %d < %d\n", + rc, len); + } + + return 0; +} + + +int +e1_dahdi_trunkdev_open(struct e1_intf *e1i) +{ + struct dahdi_trunkdev_create _cr; + struct e1_trunkdev_intf_data *tid; + struct e1_line *e1l; + int rc, fd; + + /* various sanity checks */ + + if (e1i->drv != E1_DRIVER_DAHDI_TRUNKDEV) { + LOGPIF(e1i, DTRUNK, LOGL_ERROR, "Cannot open non-trunkdev trunk as trunkdev\n"); + return -EINVAL; + } + + if (!e1i->dahdi_trunkdev.name) { + LOGPIF(e1i, DTRUNK, LOGL_ERROR, "Cannot open trunkdev without name\n"); + return -EINVAL; + } + + if (strlen(e1i->dahdi_trunkdev.name) > sizeof(_cr.name)-1) { + LOGPIF(e1i, DTRUNK, LOGL_ERROR, "Cannot open trunkdev with excessively long name\n"); + return -EINVAL; + } + + if (e1i->drv_data) { + LOGPIF(e1i, DTRUNK, LOGL_NOTICE, "Cannot open trunkdev that's already open\n"); + return -EBUSY; + } + + /* open the trunkdev */ + fd = open("/dev/dahdi/trunkdev", O_RDWR); + if (fd < 0) { + LOGPIF(e1i, DTRUNK, LOGL_ERROR, "Cannot open /dev/dahdi/trunkdev: %s\n", + strerror(errno)); + return -errno; + } + + /* try to select the trunk by name */ + rc = trunkdev_specify(fd, e1i->dahdi_trunkdev.name); + if (rc < 0) { + LOGPIF(e1i, DTRUNK, LOGL_ERROR, "Unable to specify trunkdev '%s': %s\n", + e1i->dahdi_trunkdev.name, strerror(errno)); + /* TODO: auto- create on demand? */ + close(fd); + return -errno; + } + + LOGPIF(e1i, DTRUNK, LOGL_NOTICE, "Successfully opened trunkdev '%s'\n", e1i->dahdi_trunkdev.name); + tid = talloc_zero(e1i->e1d->ctx, struct e1_trunkdev_intf_data); + OSMO_ASSERT(tid); + osmo_fd_setup(&tid->ofd, fd, OSMO_FD_READ, dahdi_trunkdev_fd_cb, e1i, e1i->id); + osmo_fd_register(&tid->ofd); + e1i->drv_data = tid; + + /* ensure line0 exists */ + if (!e1_intf_find_line(e1i, 0)) { + e1l = e1_line_new(e1i, 0, NULL); + e1l->mode = E1_LINE_MODE_E1OIP; + } + + /* activate line */ + llist_for_each_entry(e1l, &e1i->lines, list) + e1_line_active(e1l); + + return 0; +} + +int +e1_dahdi_trunkdev_close(struct e1_intf *e1i) +{ + struct e1_trunkdev_intf_data *tid = e1i->drv_data; + int rc; + + if (e1i->drv != E1_DRIVER_DAHDI_TRUNKDEV) { + LOGPIF(e1i, DTRUNK, LOGL_ERROR, "Cannot close non-trunkdev trunk as trunkdev\n"); + return -EINVAL; + } + + if (!tid) { + LOGPIF(e1i, DTRUNK, LOGL_DEBUG, "No need to close trunkdev; was not open\n"); + return 0; + } + + osmo_fd_unregister(&tid->ofd); + + /* we're not deleting the dahdi trunkdev as that might upset the applications using + * the channel-side of it */ + rc = close(tid->ofd.fd); + if (rc < 0) + LOGPIF(e1i, DTRUNK, LOGL_ERROR, "Error closing trunkdev: %s\n", strerror(errno)); + + talloc_free(tid); + e1i->drv_data = tid = NULL; + + LOGPIF(e1i, DTRUNK, LOGL_NOTICE, "Closed trunkdev '%s'\n", e1i->dahdi_trunkdev.name); + + return 0; +} diff --git a/src/e1d.h b/src/e1d.h index 82c9bb6..c1c0392 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -161,6 +161,7 @@ enum e1_driver { E1_DRIVER_USB, E1_DRIVER_VPAIR, + E1_DRIVER_DAHDI_TRUNKDEV, }; extern const struct value_string e1_driver_names[]; @@ -180,6 +181,9 @@ uint16_t fine; } gpsdo; } usb; + struct { + char *name; + } dahdi_trunkdev; bool vty_created; enum e1_driver drv; @@ -210,6 +214,9 @@ struct e1_intf * e1d_find_intf_by_usb_serial(struct e1_daemon *e1d, const char *serial_str); +struct e1_intf * +e1d_find_intf_by_trunkdev_name(struct e1_daemon *e1d, const char *name); + void e1_intf_destroy(struct e1_intf *intf); @@ -245,6 +252,12 @@ e1d_vpair_intf_peer(struct e1_intf *intf); int +e1_dahdi_trunkdev_open(struct e1_intf *e1i); + +int +e1_dahdi_trunkdev_close(struct e1_intf *e1i); + +int e1oip_line_demux_in(struct e1_line *line, const uint8_t *buf, int ftr); int diff --git a/src/e1oip.c b/src/e1oip.c index 384a91b..86172d0 100644 --- a/src/e1oip.c +++ b/src/e1oip.c @@ -48,6 +48,16 @@ return e1_intf_find_line(e1i, id); } +/* convenience helper function finding a e1_line for given name + id */ +static struct e1_line * +find_line_by_trunkdev_name(struct e1_daemon *e1d, const char *name, uint8_t id) +{ + struct e1_intf *e1i = e1d_find_intf_by_trunkdev_name(e1d, name); + if (!e1i) + return NULL; + return e1_intf_find_line(e1i, id); +} + static struct e1_line * find_line_for_account(struct e1_daemon *e1d, const struct octoi_account *acc) { @@ -55,8 +65,9 @@ case ACCOUNT_MODE_ICE1USB: return find_line_by_usb_serial(e1d, acc->u.ice1usb.usb_serial, acc->u.ice1usb.line_nr); - case ACCOUNT_MODE_DAHDI: - OSMO_ASSERT(0); /* TODO */ + case ACCOUNT_MODE_DAHDI_TRUNKDEV: + return find_line_by_trunkdev_name(e1d, acc->u.dahdi_trunkdev.name, + acc->u.dahdi_trunkdev.line_nr); break; default: return NULL; @@ -127,6 +138,35 @@ return line; } +static void +_e1d_octoi_client_updated_cb(struct octoi_client *clnt) +{ + struct e1_daemon *e1d = g_octoi->priv; + struct e1_line *line; + + /* find line for client */ + line = find_line_for_account(e1d, clnt->cfg.account); + if (!line) + return; + + if (line->mode != E1_LINE_MODE_E1OIP) + return; + + /* check if line is active */ + if (!osmo_timer_pending(&line->ts0.timer)) + return; + + /* TODO: kill old peer, if != current peer */ + if (!line->octoi_peer) + line->octoi_peer = octoi_client_get_peer(clnt); + else + OSMO_ASSERT(line->octoi_peer == octoi_client_get_peer(clnt)); + + /* start client for peer (if not started) */ + OSMO_ASSERT(line->octoi_peer); + octoi_clnt_start_for_peer(line->octoi_peer, clnt->cfg.account); +} + /* OCTOI has detected that a given peer has vanished; delete reference to it */ static void _e1d_octoi_peer_disconnected_cb(struct octoi_peer *peer) @@ -148,5 +188,6 @@ const struct octoi_ops e1d_octoi_ops = { .client_connected = &_e1d_octoi_client_connected_cb, + .client_updated = &_e1d_octoi_client_updated_cb, .peer_disconnected = &_e1d_octoi_peer_disconnected_cb, }; diff --git a/src/intf_line.c b/src/intf_line.c index 811b8fe..3895653 100644 --- a/src/intf_line.c +++ b/src/intf_line.c @@ -46,6 +46,7 @@ const struct value_string e1_driver_names[] = { { E1_DRIVER_USB, "usb" }, { E1_DRIVER_VPAIR, "vpair" }, + { E1_DRIVER_DAHDI_TRUNKDEV, "dahdi-trunkdev" }, { 0, NULL } }; @@ -133,6 +134,22 @@ return NULL; } +struct e1_intf * +e1d_find_intf_by_trunkdev_name(struct e1_daemon *e1d, const char *name) +{ + struct e1_intf *intf; + + if (!name) + return NULL; + + llist_for_each_entry(intf, &e1d->interfaces, list) { + if (intf->dahdi_trunkdev.name && !strcmp(intf->dahdi_trunkdev.name, name)) + return intf; + } + + return NULL; +} + struct e1_line * e1_intf_find_line(struct e1_intf *intf, uint8_t id) { @@ -300,6 +317,11 @@ line->id == acc->u.ice1usb.line_nr) return clnt; break; + case ACCOUNT_MODE_DAHDI_TRUNKDEV: + if (!strcmp(line->intf->dahdi_trunkdev.name, acc->u.dahdi_trunkdev.name) && + line->id == acc->u.dahdi_trunkdev.line_nr) + return clnt; + break; case ACCOUNT_MODE_NONE: case ACCOUNT_MODE_REDIRECT: break; diff --git a/src/log.c b/src/log.c index e2b90dc..fc89a10 100644 --- a/src/log.c +++ b/src/log.c @@ -38,6 +38,12 @@ .loglevel = LOGL_NOTICE, .enabled = 1, }, + [DTRUNK] = { + .name = "DTRUNK", + .description = "DAHDI trunkdev driver", + .loglevel = LOGL_NOTICE, + .enabled = 1, + }, }; const struct log_info log_info = { diff --git a/src/log.h b/src/log.h index d46a5a7..d23328d 100644 --- a/src/log.h +++ b/src/log.h @@ -29,6 +29,7 @@ enum { DE1D, DXFR, + DTRUNK, }; #define LOGPIF(itf, ss, lvl, fmt, args...) \ diff --git a/src/octoi/octoi.c b/src/octoi/octoi.c index 8d82092..6e4b8f9 100644 --- a/src/octoi/octoi.c +++ b/src/octoi/octoi.c @@ -43,6 +43,7 @@ int octoi_vty_go_parent(struct vty *vty) { struct octoi_account *acc; + struct octoi_client *clnt; switch (vty->node) { case OCTOI_ACCOUNT_NODE: @@ -54,6 +55,14 @@ vty->node = OCTOI_CLNT_NODE; vty->index = client4account(acc); break; + case OCTOI_CLNT_NODE: + clnt = vty->index; + /* check if we have a (new?) line for this client */ + if (g_octoi->ops->client_updated) + g_octoi->ops->client_updated(clnt); + vty->node = CONFIG_NODE; + vty->index = NULL; + break; default: vty->node = CONFIG_NODE; vty->index = NULL; diff --git a/src/octoi/octoi_clnt_vty.c b/src/octoi/octoi_clnt_vty.c index ff50ddb..23d53e5 100644 --- a/src/octoi/octoi_clnt_vty.c +++ b/src/octoi/octoi_clnt_vty.c @@ -281,6 +281,8 @@ install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_mode_cmd); install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_batching_factor_cmd); install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_prefill_frame_count_cmd); + install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_trunkdev_name_cmd); + install_element(OCTOI_CLNT_ACCOUNT_NODE, &cfg_account_trunkdev_line_cmd); install_node(&clnt_node, config_write_octoi_clnt); install_element(CONFIG_NODE, &cfg_client_cmd); diff --git a/src/octoi/octoi_srv_fsm.c b/src/octoi/octoi_srv_fsm.c index cda0e52..ed9e8f9 100644 --- a/src/octoi/octoi_srv_fsm.c +++ b/src/octoi/octoi_srv_fsm.c @@ -109,7 +109,7 @@ switch (acc->mode) { case ACCOUNT_MODE_ICE1USB: - case ACCOUNT_MODE_DAHDI: + case ACCOUNT_MODE_DAHDI_TRUNKDEV: /* check if a matching device exists for that account */ st->app_priv = g_octoi->ops->client_connected(srv, st->peer, acc); if (!st->app_priv) { diff --git a/src/octoi/octoi_srv_vty.c b/src/octoi/octoi_srv_vty.c index 58d18bc..5faad54 100644 --- a/src/octoi/octoi_srv_vty.c +++ b/src/octoi/octoi_srv_vty.c @@ -48,7 +48,7 @@ { ACCOUNT_MODE_NONE, "none" }, { ACCOUNT_MODE_ICE1USB, "ice1usb" }, { ACCOUNT_MODE_REDIRECT, "redirect" }, - { ACCOUNT_MODE_DAHDI, "dahdi" }, + { ACCOUNT_MODE_DAHDI_TRUNKDEV, "dahdi-trunkdev" }, { 0, NULL } }; @@ -288,10 +288,11 @@ #endif gDEFUN(cfg_account_mode, cfg_account_mode_cmd, - "mode (ice1usb|redirect)", + "mode (ice1usb|redirect|dahdi-trunkdev)", "Operational mode of account\n" "Connect to local icE1usb (identified by USB serial + line number)\n" - "Redirect to other IP/Port\n") + "Redirect to other IP/Port\n" + "Use DAHDI trunkdev virtual trunk\n") { struct octoi_account *acc = vty->index; @@ -309,6 +310,8 @@ acc->mode = ACCOUNT_MODE_ICE1USB; } else if (!strcmp(argv[0], "redirect")) { acc->mode = ACCOUNT_MODE_REDIRECT; + } else if (!strcmp(argv[0], "dahdi-trunkdev")) { + acc->mode = ACCOUNT_MODE_DAHDI_TRUNKDEV; } else OSMO_ASSERT(0); @@ -400,6 +403,39 @@ acc->batching_factor, acc->prefill_frame_count, VTY_NEWLINE); } +#define DAHDI_STR "DAHDI trunkdev settings\n" + +gDEFUN(cfg_account_trunkdev_name, cfg_account_trunkdev_name_cmd, + "dahdi-trunkdev name NAME", + DAHDI_STR "Identify DAHDI trunkdev device by name\n" + "Name of the DAHDI trunkdev device\n") +{ + struct octoi_account *acc = vty->index; + + if (acc->mode != ACCOUNT_MODE_DAHDI_TRUNKDEV) { + vty_out(vty, "%% Error: Not in dahdi-trunkdev mode!%s", VTY_NEWLINE); + return CMD_WARNING; + } + + osmo_talloc_replace_string(acc, &acc->u.dahdi_trunkdev.name, argv[0]); + return CMD_SUCCESS; +} + +gDEFUN(cfg_account_trunkdev_line, cfg_account_trunkdev_line_cmd, + "dahdi-trunkdev line-number <0-1>", + DAHDI_STR "E1 Line number\n" "E1 Line number\n") +{ + struct octoi_account *acc = vty->index; + + if (acc->mode != ACCOUNT_MODE_DAHDI_TRUNKDEV) { + vty_out(vty, "%% Error: Not in dahdi-trunkdev mode!%s", VTY_NEWLINE); + return CMD_WARNING; + } + + acc->u.dahdi_trunkdev.line_nr = atoi(argv[0]); + return CMD_SUCCESS; +} + void octoi_vty_write_one_account(struct vty *vty, const struct octoi_account *acc) { if (!acc) @@ -427,8 +463,11 @@ vty_out(vty, " redirect %s %u%s", acc->u.redirect.to.ip, acc->u.redirect.to.port, VTY_NEWLINE); break; - case ACCOUNT_MODE_DAHDI: - OSMO_ASSERT(0); + case ACCOUNT_MODE_DAHDI_TRUNKDEV: + if (acc->u.dahdi_trunkdev.name) + vty_out(vty, " dahdi-trunkdev name %s%s", acc->u.dahdi_trunkdev.name, VTY_NEWLINE); + + vty_out(vty, " dahdi-trunkdev line-number %u%s", acc->u.dahdi_trunkdev.line_nr, VTY_NEWLINE); break; } } @@ -489,6 +528,8 @@ install_element(OCTOI_ACCOUNT_NODE, &cfg_account_redir_cmd); install_element(OCTOI_ACCOUNT_NODE, &cfg_account_batching_factor_cmd); install_element(OCTOI_ACCOUNT_NODE, &cfg_account_prefill_frame_count_cmd); + install_element(OCTOI_ACCOUNT_NODE, &cfg_account_trunkdev_name_cmd); + install_element(OCTOI_ACCOUNT_NODE, &cfg_account_trunkdev_line_cmd); install_node(&srv_node, config_write_octoi_srv); install_element(CONFIG_NODE, &cfg_server_cmd); diff --git a/src/octoi/octoi_vty.h b/src/octoi/octoi_vty.h index 16c5337..33188e4 100644 --- a/src/octoi/octoi_vty.h +++ b/src/octoi/octoi_vty.h @@ -9,6 +9,8 @@ extern struct cmd_element cfg_account_ice1_line_cmd; extern struct cmd_element cfg_account_batching_factor_cmd; extern struct cmd_element cfg_account_prefill_frame_count_cmd; +extern struct cmd_element cfg_account_trunkdev_name_cmd; +extern struct cmd_element cfg_account_trunkdev_line_cmd; struct octoi_account *octoi_client_account_create(struct octoi_client *clnt, const char *user_id); diff --git a/src/vty.c b/src/vty.c index 6507937..824d83a 100644 --- a/src/vty.c +++ b/src/vty.c @@ -88,10 +88,19 @@ static const char *intf_serno(const struct e1_intf *intf) { - if (intf->usb.serial_str) - return intf->usb.serial_str; - else - return "unnamed"; + switch (intf->drv) { + case E1_DRIVER_USB: + if (intf->usb.serial_str) + return intf->usb.serial_str; + break; + case E1_DRIVER_DAHDI_TRUNKDEV: + if (intf->dahdi_trunkdev.name) + return intf->dahdi_trunkdev.name; + break; + default: + break; + } + return "unnamed"; } static void vty_dump_intf(struct vty *vty, const struct e1_intf *intf) @@ -288,6 +297,30 @@ return CMD_SUCCESS; } +DEFUN(cfg_e1d_if_trunkdev, cfg_e1d_if_trunkdev_cmd, "interface <0-255> dahdi-trunkdev", + "Configure a DAHDI trunkdev interface (virtual trunk)\n" + "E1 Interface Number\n" + "Use DAHDI trunkdev driver for this interface\n") +{ + struct e1_intf *intf; + int intf_nr = atoi(argv[0]); + + intf = e1d_find_intf(vty_e1d, intf_nr); + if (!intf) { + intf = e1_intf_new(vty_e1d, intf_nr, NULL); + } + if (!intf) { + vty_out(vty, "%% Could not create interface%s", VTY_NEWLINE); + return CMD_WARNING; + } + intf->drv = E1_DRIVER_DAHDI_TRUNKDEV; + intf->vty_created = true; + + vty->index = intf; + vty->node = INTF_NODE; + return CMD_SUCCESS; +} + DEFUN(cfg_e1d_if_usb_serial, cfg_e1d_if_usb_serial_cmd, "usb-serial SERNO", "Configure the USB serial number of an E1 interface device\n" @@ -334,6 +367,24 @@ return CMD_SUCCESS; } +DEFUN(cfg_e1d_if_trunkdev_name, cfg_e1d_if_trunkdev_name_cmd, + "trunkdev-name SERNO", + "Configure the name of the DAHDI trunkdev device\n" + "DAHDI trunkdev name\n") +{ + struct e1_intf *intf = vty->index; + + if (intf->drv != E1_DRIVER_DAHDI_TRUNKDEV) + return CMD_WARNING; + + osmo_talloc_replace_string(intf, &intf->dahdi_trunkdev.name, argv[0]); + + e1_dahdi_trunkdev_close(intf); + e1_dahdi_trunkdev_open(intf); + + return CMD_SUCCESS; +} + DEFUN(cfg_e1d_if_line, cfg_e1d_if_line_cmd, "line <0-255>", "Configure an E1 line\n" "E1 Interface Number\n") @@ -425,6 +476,11 @@ case E1_DRIVER_VPAIR: vty_out(vty, " interface %u vpair%s", intf->id, VTY_NEWLINE); break; + case E1_DRIVER_DAHDI_TRUNKDEV: + vty_out(vty, " interface %u dahdi-trunkdev%s", intf->id, VTY_NEWLINE); + if (intf->dahdi_trunkdev.name && strlen(intf->dahdi_trunkdev.name)) + vty_out(vty, " trunkdev-name %s%s", intf->dahdi_trunkdev.name, VTY_NEWLINE); + break; default: break; } @@ -449,10 +505,12 @@ install_node(&intf_node, NULL); install_element(E1D_NODE, &cfg_e1d_if_icE1usb_cmd); install_element(E1D_NODE, &cfg_e1d_if_vpair_cmd); + install_element(E1D_NODE, &cfg_e1d_if_trunkdev_cmd); install_element(INTF_NODE, &cfg_e1d_if_line_cmd); install_element(INTF_NODE, &cfg_e1d_if_usb_serial_cmd); install_element(INTF_NODE, &cfg_e1d_if_gpsdo_manual_cmd); install_element(INTF_NODE, &cfg_e1d_if_no_gpsdo_manual_cmd); + install_element(INTF_NODE, &cfg_e1d_if_trunkdev_name_cmd); install_node(&line_node, NULL); install_element(LINE_NODE, &cfg_e1d_if_line_mode_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib15a7313fcd63e1ed9f2f5b349df967bc4335ec2 Gerrit-Change-Number: 30068 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 7 months

1
0
0 0

Change in libosmocore[master]: Fix typos in copyright statements.

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30067 ) Change subject: Fix typos in copyright statements. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I783c56bb1d216ce3a47a19da230ee5f50aca2ab3 Gerrit-Change-Number: 30067 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 09 Nov 2022 21:52:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmocom-bb[master]: fw: Add initial support for Sony Ericsson K200i/K220i phones

by laforge

Attention is currently required from: fixeria, steve-m. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30051 ) Change subject: fw: Add initial support for Sony Ericsson K200i/K220i phones ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: looks good to me, but I don't know anything about the hardware, of course. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I711702862b1cec5a8089dac071f8a171ca026003 Gerrit-Change-Number: 30051 Gerrit-PatchSet: 1 Gerrit-Owner: steve-m <steve(a)steve-m.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: falconia <falcon(a)freecalypso.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: steve-m <steve(a)steve-m.de> Gerrit-Comment-Date: Wed, 09 Nov 2022 21:24:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2022