summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-03-21 22:28:22 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2016-03-22 01:12:26 +0100
commit8e5c63f032398ad45052b538890071919de8a20e (patch)
tree6e41449a31efcd21c4bd6dabf30f93f4e4f16a15
parent2cd36e87ae3e09e33225ac3b1ef4ca649f21f2f0 (diff)
cosmetic: whitespace, comment, rename static func rx_iu_event()
-rw-r--r--openbsc/include/openbsc/iu.h4
-rw-r--r--openbsc/src/libiu/iu.c2
-rw-r--r--openbsc/src/libmsc/auth.c2
-rw-r--r--openbsc/src/libmsc/gsm_04_08.c2
-rw-r--r--openbsc/src/osmo-cscn/cscn_main.c6
5 files changed, 8 insertions, 8 deletions
diff --git a/openbsc/include/openbsc/iu.h b/openbsc/include/openbsc/iu.h
index f4bfbd2ca..f2f1fc9e7 100644
--- a/openbsc/include/openbsc/iu.h
+++ b/openbsc/include/openbsc/iu.h
@@ -23,8 +23,8 @@ typedef int (* iu_recv_cb_t )(struct msgb *msg, struct gprs_ra_id *ra_id,
/* TODO is ra_id only used for gprs? ^ */
uint16_t *sai);
-typedef int (* iu_event_cb_t )(struct ue_conn_ctx *ue_ctx, enum iu_event_type type,
- void *data);
+typedef int (* iu_event_cb_t )(struct ue_conn_ctx *ue_ctx,
+ enum iu_event_type type, void *data);
typedef int (* iu_rab_ass_resp_cb_t )(struct ue_conn_ctx *ue_ctx, uint8_t rab_id,
struct RANAP_RAB_SetupOrModifiedItemIEs_s *setup_ies);
diff --git a/openbsc/src/libiu/iu.c b/openbsc/src/libiu/iu.c
index beeb761b1..ed428a1af 100644
--- a/openbsc/src/libiu/iu.c
+++ b/openbsc/src/libiu/iu.c
@@ -146,11 +146,9 @@ int iu_tx_sec_mode_cmd(struct ue_conn_ctx *uectx, struct gsm_auth_tuple *tp)
PRIM_OP_REQUEST, msg);
osmo_sua_user_link_down(uectx->link, &prim->oph);
-
return 0;
}
-
static int ranap_handle_co_initial_ue(void *ctx, RANAP_InitialUE_MessageIEs_t *ies)
{
struct gprs_ra_id ra_id;
diff --git a/openbsc/src/libmsc/auth.c b/openbsc/src/libmsc/auth.c
index 322ea376b..3d036950f 100644
--- a/openbsc/src/libmsc/auth.c
+++ b/openbsc/src/libmsc/auth.c
@@ -113,11 +113,13 @@ int auth_get_tuple_for_subscr(struct gsm_auth_tuple *atuple,
case AUTH_ALGO_XOR:
if (_use_xor(&ainfo, atuple))
+ /* non-zero return value means failure */
return 0;
break;
case AUTH_ALGO_COMP128v1:
if (_use_comp128_v1(&ainfo, atuple))
+ /* non-zero return value means failure */
return 0;
break;
diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c
index 51e5f249a..e79a21864 100644
--- a/openbsc/src/libmsc/gsm_04_08.c
+++ b/openbsc/src/libmsc/gsm_04_08.c
@@ -231,7 +231,7 @@ int gsm48_secure_channel(struct gsm_subscriber_connection *conn, int key_seq,
op->cb_data = cb_data;
memcpy(&op->atuple, &atuple, sizeof(struct gsm_auth_tuple));
- /* FIXME: Should start a timer for completion ... */
+ /* FIXME: Should start a timer for completion ... */
/* Then do whatever is needed ... */
if ((rc == AUTH_DO_AUTH_THEN_CIPH) || (rc == AUTH_DO_AUTH)) {
diff --git a/openbsc/src/osmo-cscn/cscn_main.c b/openbsc/src/osmo-cscn/cscn_main.c
index 88963651d..80b98731b 100644
--- a/openbsc/src/osmo-cscn/cscn_main.c
+++ b/openbsc/src/osmo-cscn/cscn_main.c
@@ -322,8 +322,8 @@ static int rcvmsg_iu_cs(struct msgb *msg, struct gprs_ra_id *ra_id, /* FIXME gpr
return gsm0408_rcvmsg_iucs(cscn_network, msg);
}
-static int handle_iu_event(struct ue_conn_ctx *ctx, enum iu_event_type type,
- void *data)
+static int rx_iu_event(struct ue_conn_ctx *ctx, enum iu_event_type type,
+ void *data)
{
DEBUGP(DIUCS, "got Iu-CS event %u\n", type);
@@ -485,7 +485,7 @@ TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_i
/* TODO: implement A-Interface and remove above legacy stuff. */
/* Set up Iu-CS */
- iu_init(tall_cscn_ctx, "127.0.0.1", 14001, rcvmsg_iu_cs, handle_iu_event);
+ iu_init(tall_cscn_ctx, "127.0.0.1", 14001, rcvmsg_iu_cs, rx_iu_event);
if (cscn_cmdline_config.daemonize) {
rc = osmo_daemonize();