lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/40436?usp=email ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: gsn: fix coding style issue ...................................................................... gsn: fix coding style issue Remove a space between callbacks. Change-Id: I1d978ed32619b626e82aa70887ac94b82c4de378 --- M gtp/gsn.c M include/osmocom/gtp/gsn.h 2 files changed, 36 insertions(+), 38 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/gtp/gsn.c b/gtp/gsn.c index 782858f..14c86ad 100644 --- a/gtp/gsn.c +++ b/gtp/gsn.c @@ -163,21 +163,21 @@ } int gtp_set_cb_unsup_ind(struct gsn_t *gsn, - int (*cb) (struct sockaddr_in * peer)) + int (*cb)(struct sockaddr_in *peer)) { gsn->cb_unsup_ind = cb; return 0; } int gtp_set_cb_extheader_ind(struct gsn_t *gsn, - int (*cb) (struct sockaddr_in * peer)) + int (*cb)(struct sockaddr_in *peer)) { gsn->cb_extheader_ind = cb; return 0; } int gtp_set_cb_ran_info_relay_ind(struct gsn_t *gsn, - int (*cb) (struct sockaddr_in * peer, union gtpie_member **ie)) + int (*cb)(struct sockaddr_in *peer, union gtpie_member **ie)) { gsn->cb_ran_info_relay_ind = cb; return 0; @@ -185,22 +185,22 @@ /* API: Initialise delete context callback */ /* Called whenever a pdp context is deleted for any reason */ -int gtp_set_cb_delete_context(struct gsn_t *gsn, int (*cb) (struct pdp_t * pdp)) +int gtp_set_cb_delete_context(struct gsn_t *gsn, int (*cb)(struct pdp_t *pdp)) { gsn->cb_delete_context = cb; return 0; } int gtp_set_cb_conf(struct gsn_t *gsn, - int (*cb) (int type, int cause, - struct pdp_t * pdp, void *cbp)) + int (*cb)(int type, int cause, + struct pdp_t *pdp, void *cbp)) { gsn->cb_conf = cb; return 0; } int gtp_set_cb_recovery(struct gsn_t *gsn, - int (*cb) (struct sockaddr_in * peer, uint8_t recovery)) + int (*cb)(struct sockaddr_in *peer, uint8_t recovery)) { gsn->cb_recovery = cb; return 0; @@ -214,7 +214,8 @@ * specs. */ int gtp_set_cb_recovery2(struct gsn_t *gsn, - int (*cb_recovery2) (struct sockaddr_in * peer, struct pdp_t * pdp, uint8_t recovery)) + int (*cb_recovery2)(struct sockaddr_in *peer, + struct pdp_t *pdp, uint8_t recovery)) { gsn->cb_recovery2 = cb_recovery2; return 0; @@ -228,16 +229,16 @@ * specs. */ int gtp_set_cb_recovery3(struct gsn_t *gsn, - int (*cb_recovery3) (struct gsn_t *gsn, struct sockaddr_in *peer, - struct pdp_t *pdp, uint8_t recovery)) + int (*cb_recovery3)(struct gsn_t *gsn, struct sockaddr_in *peer, + struct pdp_t *pdp, uint8_t recovery)) { gsn->cb_recovery3 = cb_recovery3; return 0; } int gtp_set_cb_data_ind(struct gsn_t *gsn, - int (*cb_data_ind) (struct pdp_t * pdp, - void *pack, unsigned len)) + int (*cb_data_ind)(struct pdp_t *pdp, + void *pack, unsigned len)) { gsn->cb_data_ind = cb_data_ind; return 0; diff --git a/include/osmocom/gtp/gsn.h b/include/osmocom/gtp/gsn.h index 006fdfd..772e845 100644 --- a/include/osmocom/gtp/gsn.h +++ b/include/osmocom/gtp/gsn.h @@ -97,17 +97,17 @@ struct osmo_timer_list queue_timer; /* internal queue_{req,resp} timer */ /* Call back functions */ - int (*cb_delete_context) (struct pdp_t *); - int (*cb_create_context_ind) (struct pdp_t *); + int (*cb_delete_context)(struct pdp_t *pdp); + int (*cb_create_context_ind)(struct pdp_t *pdp); int (*cb_update_context_ind)(struct pdp_t *pdp); - int (*cb_unsup_ind) (struct sockaddr_in * peer); - int (*cb_extheader_ind) (struct sockaddr_in * peer); - int (*cb_ran_info_relay_ind) (struct sockaddr_in *peer, union gtpie_member **ie); - int (*cb_conf) (int type, int cause, struct pdp_t * pdp, void *cbp); - int (*cb_data_ind) (struct pdp_t * pdp, void *pack, unsigned len); - int (*cb_recovery) (struct sockaddr_in * peer, uint8_t recovery); - int (*cb_recovery2) (struct sockaddr_in * peer, struct pdp_t * pdp, uint8_t recovery); - int (*cb_recovery3) (struct gsn_t *gsn, struct sockaddr_in *peer, struct pdp_t *pdp, uint8_t recovery); + int (*cb_unsup_ind)(struct sockaddr_in *peer); + int (*cb_extheader_ind)(struct sockaddr_in *peer); + int (*cb_ran_info_relay_ind)(struct sockaddr_in *peer, union gtpie_member **ie); + int (*cb_conf)(int type, int cause, struct pdp_t *pdp, void *cbp); + int (*cb_data_ind)(struct pdp_t *pdp, void *pack, unsigned len); + int (*cb_recovery)(struct sockaddr_in *peer, uint8_t recovery); + int (*cb_recovery2)(struct sockaddr_in *peer, struct pdp_t *pdp, uint8_t recovery); + int (*cb_recovery3)(struct gsn_t *gsn, struct sockaddr_in *peer, struct pdp_t *pdp, uint8_t recovery); /* Counters */ struct rate_ctr_group *ctrg; @@ -132,45 +132,42 @@ void *cbp); extern int gtp_set_cb_create_context_ind(struct gsn_t *gsn, - int (*cb_create_context_ind) (struct - pdp_t * - pdp)); + int (*cb_create_context_ind)(struct pdp_t *pdp)); extern int gtp_set_cb_update_context_ind(struct gsn_t *gsn, int (*cb_update_context_ind)(struct pdp_t *pdp)); extern int gtp_set_cb_data_ind(struct gsn_t *gsn, - int (*cb_data_ind) (struct pdp_t * pdp, + int (*cb_data_ind)(struct pdp_t *pdp, void *pack, unsigned len)); extern int gtp_set_cb_delete_context(struct gsn_t *gsn, - int (*cb_delete_context) (struct pdp_t * - pdp)); + int (*cb_delete_context)(struct pdp_t *pdp)); /*extern int gtp_set_cb_create_context(struct gsn_t *gsn, - int (*cb_create_context) (struct pdp_t* pdp)); */ + int (*cb_create_context) (struct pdp_t *pdp)); */ extern int gtp_set_cb_unsup_ind(struct gsn_t *gsn, - int (*cb) (struct sockaddr_in * peer)); + int (*cb)(struct sockaddr_in *peer)); extern int gtp_set_cb_extheader_ind(struct gsn_t *gsn, - int (*cb) (struct sockaddr_in * peer)); + int (*cb)(struct sockaddr_in *peer)); extern int gtp_set_cb_ran_info_relay_ind(struct gsn_t *gsn, - int (*cb) (struct sockaddr_in * peer, union gtpie_member **ie)); + int (*cb)(struct sockaddr_in *peer, union gtpie_member **ie)); extern int gtp_set_cb_conf(struct gsn_t *gsn, - int (*cb) (int type, int cause, struct pdp_t * pdp, + int (*cb)(int type, int cause, struct pdp_t *pdp, void *cbp)); int gtp_set_cb_recovery(struct gsn_t *gsn, - int (*cb) (struct sockaddr_in * peer, + int (*cb)(struct sockaddr_in *peer, uint8_t recovery)) OSMO_DEPRECATED("Use gtp_set_cb_recovery2() instead, to obtain pdp ctx originating the recovery"); int gtp_set_cb_recovery2(struct gsn_t *gsn, - int (*cb) (struct sockaddr_in * peer, - struct pdp_t * pdp, + int (*cb)(struct sockaddr_in *peer, + struct pdp_t *pdp, uint8_t recovery)) OSMO_DEPRECATED("Use gtp_set_cb_recovery3() instead, to obtain gsn handling the recovery"); int gtp_set_cb_recovery3(struct gsn_t *gsn, - int (*cb) (struct gsn_t * gsn, struct sockaddr_in * peer, - struct pdp_t * pdp, + int (*cb)(struct gsn_t *gsn, struct sockaddr_in *peer, + struct pdp_t *pdp, uint8_t recovery)); void gtp_clear_queues(struct gsn_t *gsn); extern int gtp_fd(struct gsn_t *gsn); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/40436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I1d978ed32619b626e82aa70887ac94b82c4de378 Gerrit-Change-Number: 40436 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> Gerrit-Reviewer: pespin <pespin@sysmocom.de>