From 575d86816faba09770353143cb7363e3dcde42ac Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Wed, 29 Nov 2023 11:36:01 -0500 Subject: [PATCH] MT#55283 turn ng_buffer into typedef Change-Id: I278cb1b81d9c23074cf159901668221f52d239dd --- daemon/call_interfaces.c | 10 +++++----- daemon/control_ng.c | 8 ++++---- daemon/ice.c | 6 +++--- daemon/janus.c | 2 +- include/call_interfaces.h | 9 ++++----- include/control_ng.h | 7 ++++--- include/ice.h | 3 +-- include/types.h | 1 + 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/daemon/call_interfaces.c b/daemon/call_interfaces.c index f909a18a9..df7c831ae 100644 --- a/daemon/call_interfaces.c +++ b/daemon/call_interfaces.c @@ -1963,7 +1963,7 @@ void save_last_sdp(struct call_monologue *ml, str *sdp, GQueue *parsed, GQueue * } -static const char *call_offer_answer_ng(struct ng_buffer *ngbuf, bencode_item_t *input, +static const char *call_offer_answer_ng(ng_buffer *ngbuf, bencode_item_t *input, bencode_item_t *output, enum call_opmode opmode, const char* addr, const endpoint_t *sin) { @@ -2129,14 +2129,14 @@ out: return errstr; } -const char *call_offer_ng(struct ng_buffer *ngbuf, bencode_item_t *input, bencode_item_t *output, +const char *call_offer_ng(ng_buffer *ngbuf, bencode_item_t *input, bencode_item_t *output, const char* addr, const endpoint_t *sin) { return call_offer_answer_ng(ngbuf, input, output, OP_OFFER, addr, sin); } -const char *call_answer_ng(struct ng_buffer *ngbuf, bencode_item_t *input, bencode_item_t *output) { +const char *call_answer_ng(ng_buffer *ngbuf, bencode_item_t *input, bencode_item_t *output) { return call_offer_answer_ng(ngbuf, input, output, OP_ANSWER, NULL, NULL); } @@ -3400,7 +3400,7 @@ found_sink: } -const char *call_publish_ng(struct ng_buffer *ngbuf, bencode_item_t *input, bencode_item_t *output, +const char *call_publish_ng(ng_buffer *ngbuf, bencode_item_t *input, bencode_item_t *output, const char *addr, const endpoint_t *sin) { @@ -3592,7 +3592,7 @@ const char *call_subscribe_request_ng(bencode_item_t *input, bencode_item_t *out } -const char *call_subscribe_answer_ng(struct ng_buffer *ngbuf, bencode_item_t *input, bencode_item_t *output) { +const char *call_subscribe_answer_ng(ng_buffer *ngbuf, bencode_item_t *input, bencode_item_t *output) { g_auto(sdp_ng_flags) flags; AUTO_CLEANUP(GQueue parsed, sdp_free) = G_QUEUE_INIT; AUTO_CLEANUP(GQueue streams, sdp_streams_free) = G_QUEUE_INIT; diff --git a/daemon/control_ng.c b/daemon/control_ng.c index f87c66e88..d09d54526 100644 --- a/daemon/control_ng.c +++ b/daemon/control_ng.c @@ -121,14 +121,14 @@ struct control_ng_stats* get_control_ng_stats(const sockaddr_t *addr) { } static void __ng_buffer_free(void *p) { - struct ng_buffer *ngbuf = p; + ng_buffer *ngbuf = p; bencode_buffer_free(&ngbuf->buffer); if (ngbuf->ref) obj_put_o(ngbuf->ref); } -struct ng_buffer *ng_buffer_new(struct obj *ref) { - struct ng_buffer *ngbuf = obj_alloc0("ng_buffer", sizeof(*ngbuf), __ng_buffer_free); +ng_buffer *ng_buffer_new(struct obj *ref) { + ng_buffer *ngbuf = obj_alloc0("ng_buffer", sizeof(*ngbuf), __ng_buffer_free); if (ref) ngbuf->ref = obj_get_o(ref); // hold until we're done @@ -143,7 +143,7 @@ int control_ng_process(str *buf, const endpoint_t *sin, char *addr, const sockad void (*cb)(str *, str *, const endpoint_t *, const sockaddr_t *, void *), void *p1, struct obj *ref) { - AUTO_CLEANUP(struct ng_buffer *ngbuf, ng_buffer_auto_release) = NULL; + AUTO_CLEANUP(ng_buffer *ngbuf, ng_buffer_auto_release) = NULL; bencode_item_t *dict, *resp; str cmd = STR_NULL, cookie, data, reply, *to_send, callid; const char *errstr, *resultstr; diff --git a/daemon/ice.c b/daemon/ice.c index f5808706e..2bd64d5a7 100644 --- a/daemon/ice.c +++ b/daemon/ice.c @@ -44,7 +44,7 @@ struct fragment_key { str from_tag; }; struct sdp_fragment { - struct ng_buffer *ngbuf; + ng_buffer *ngbuf; struct timeval received; GQueue streams; sdp_ng_flags flags; @@ -153,7 +153,7 @@ static void fragment_key_free(void *p) { g_free(k->from_tag.s); g_slice_free1(sizeof(*k), k); } -static void queue_sdp_fragment(struct ng_buffer *ngbuf, GQueue *streams, sdp_ng_flags *flags) { +static void queue_sdp_fragment(ng_buffer *ngbuf, GQueue *streams, sdp_ng_flags *flags) { ilog(LOG_DEBUG, "Queuing up SDP fragment for " STR_FORMAT_M "/" STR_FORMAT_M, STR_FMT_M(&flags->call_id), STR_FMT_M(&flags->from_tag)); @@ -174,7 +174,7 @@ static void queue_sdp_fragment(struct ng_buffer *ngbuf, GQueue *streams, sdp_ng_ g_queue_push_tail(frags, frag); mutex_unlock(&sdp_fragments_lock); } -bool trickle_ice_update(struct ng_buffer *ngbuf, struct call *call, sdp_ng_flags *flags, +bool trickle_ice_update(ng_buffer *ngbuf, struct call *call, sdp_ng_flags *flags, GQueue *streams) { if (!flags->fragment) diff --git a/daemon/janus.c b/daemon/janus.c index b3c46a2a5..dbb770659 100644 --- a/daemon/janus.c +++ b/daemon/janus.c @@ -1631,7 +1631,7 @@ static const char *janus_trickle(JsonReader *reader, struct janus_session *sessi // top-level structures first, with auto cleanup AUTO_CLEANUP(GQueue streams, sdp_streams_free) = G_QUEUE_INIT; - AUTO_CLEANUP(struct ng_buffer *ngbuf, ng_buffer_auto_release) = ng_buffer_new(NULL); + AUTO_CLEANUP(ng_buffer *ngbuf, ng_buffer_auto_release) = ng_buffer_new(NULL); g_auto(sdp_ng_flags) flags; call_ng_flags_init(&flags, OP_OTHER); diff --git a/include/call_interfaces.h b/include/call_interfaces.h index ca07a9052..887a25773 100644 --- a/include/call_interfaces.h +++ b/include/call_interfaces.h @@ -15,7 +15,6 @@ struct call; struct call_stats; struct streambuf_stream; struct sockaddr_in6; -struct ng_buffer; struct sdp_ng_flags { enum call_opmode opmode; @@ -221,9 +220,9 @@ str *call_lookup_udp(char **); str *call_delete_udp(char **); str *call_query_udp(char **); -const char *call_offer_ng(struct ng_buffer *, bencode_item_t *, bencode_item_t *, const char*, +const char *call_offer_ng(ng_buffer *, bencode_item_t *, bencode_item_t *, const char*, const endpoint_t *); -const char *call_answer_ng(struct ng_buffer *, bencode_item_t *, bencode_item_t *); +const char *call_answer_ng(ng_buffer *, bencode_item_t *, bencode_item_t *); const char *call_delete_ng(bencode_item_t *, bencode_item_t *); const char *call_query_ng(bencode_item_t *, bencode_item_t *); const char *call_list_ng(bencode_item_t *, bencode_item_t *); @@ -243,10 +242,10 @@ const char *call_stop_media_ng(bencode_item_t *, bencode_item_t *); const char *call_play_dtmf_ng(bencode_item_t *, bencode_item_t *); void ng_call_stats(struct call *call, const str *fromtag, const str *totag, bencode_item_t *output, struct call_stats *totals); -const char *call_publish_ng(struct ng_buffer *, bencode_item_t *, bencode_item_t *, const char *, +const char *call_publish_ng(ng_buffer *, bencode_item_t *, bencode_item_t *, const char *, const endpoint_t *); const char *call_subscribe_request_ng(bencode_item_t *, bencode_item_t *); -const char *call_subscribe_answer_ng(struct ng_buffer *, bencode_item_t *, bencode_item_t *); +const char *call_subscribe_answer_ng(ng_buffer *, bencode_item_t *, bencode_item_t *); const char *call_unsubscribe_ng(bencode_item_t *, bencode_item_t *); void add_media_to_sub_list(GQueue *q, struct call_media *media, struct call_monologue *ml); diff --git a/include/control_ng.h b/include/control_ng.h index 5fd87494b..7f89c26fb 100644 --- a/include/control_ng.h +++ b/include/control_ng.h @@ -37,6 +37,7 @@ enum ng_command { #include "str.h" #include "tcp_listener.h" #include "bencode.h" +#include "types.h" struct ng_command_stats { mutex_t lock; @@ -73,12 +74,12 @@ void control_ng_cleanup(void); int control_ng_process(str *buf, const endpoint_t *sin, char *addr, const sockaddr_t *local, void (*cb)(str *, str *, const endpoint_t *, const sockaddr_t *, void *), void *p1, struct obj *); -struct ng_buffer *ng_buffer_new(struct obj *ref); +ng_buffer *ng_buffer_new(struct obj *ref); -INLINE void ng_buffer_release(struct ng_buffer *ngbuf) { +INLINE void ng_buffer_release(ng_buffer *ngbuf) { obj_put(ngbuf); } -INLINE void ng_buffer_auto_release(struct ng_buffer **ngbuf) { +INLINE void ng_buffer_auto_release(ng_buffer **ngbuf) { if (*ngbuf) ng_buffer_release(*ngbuf); } diff --git a/include/ice.h b/include/ice.h index ec55d8866..1b7c8d7e8 100644 --- a/include/ice.h +++ b/include/ice.h @@ -67,7 +67,6 @@ struct call_media; struct call; struct stream_params; struct stun_attrs; -struct ng_buffer; struct call_monologue; @@ -171,7 +170,7 @@ int ice_response(struct stream_fd *, const endpoint_t *src, struct stun_attrs *attrs, void *transaction); void dequeue_sdp_fragments(struct call_monologue *); -bool trickle_ice_update(struct ng_buffer *ngbuf, struct call *call, sdp_ng_flags *flags, +bool trickle_ice_update(ng_buffer *ngbuf, struct call *call, sdp_ng_flags *flags, GQueue *streams); enum thread_looper_action ice_slow_timer(void); diff --git a/include/types.h b/include/types.h index 4737e6cf5..f0f4f2dbe 100644 --- a/include/types.h +++ b/include/types.h @@ -3,6 +3,7 @@ typedef struct sdp_ng_flags sdp_ng_flags; typedef struct stats_metric stats_metric; +typedef struct ng_buffer ng_buffer; #include "containers.h"