Skip to content

Commit 5e63304

Browse files
sobomaxsobomax
committed
Re-gen.
1 parent 666aac3 commit 5e63304

File tree

27 files changed

+2534
-409
lines changed

27 files changed

+2534
-409
lines changed

‎Makefile.in‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,9 @@ am__define_uniq_tagged_files = \
195195
unique=`for i in $$list; do \
196196
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
197197
done | $(am__uniquify_input)`
198-
DIST_SUBDIRS = libexecinfo libucl libxxHash libre makeann modules \
199-
external/libelperiodic/src src pertools extractaudio doc tests
198+
DIST_SUBDIRS = libexecinfo libucl libxxHash libRTQueue libre makeann \
199+
modules external/libelperiodic/src src pertools extractaudio \
200+
doc tests
200201
am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in AUTHORS \
201202
ChangeLog INSTALL README.md compile config.guess config.sub \
202203
depcomp install-sh ltmain.sh missing
@@ -399,7 +400,7 @@ AUTOMAKE_OPTIONS = foreign
399400
@BUILD_UDP_CONTENTION_TRUE@SUBD_UDCNT = pertools
400401
@BUILD_DOCS_TRUE@SUBD_DOCS = doc
401402
@BUILD_CRYPTO_TRUE@SUB_LIBRE = libre
402-
SUBDIRS = libexecinfo libucl libxxHash $(SUB_LIBRE) makeann \
403+
SUBDIRS = libexecinfo libucl libxxHash libRTQueue $(SUB_LIBRE) makeann \
403404
$(SUBD_MOD) $(SUBD_ELP) src $(SUBD_UDCNT) $(SUBD_EAUD) \
404405
${SUBD_DOCS} $(am__append_1)
405406
dist_man_MANS = rtpproxy.8

‎autosrc/Makefile.ami‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,13 @@ rtpp_socket_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_socket_fin.h $(RTPP_AUTOSRC_DIR)
5858
SRCS_AUTOGEN_DEBUG += $(rtpp_socket_AUTOSRCS)
5959
rtpp_refproxy_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_refproxy_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_refproxy_fin.c
6060
SRCS_AUTOGEN_DEBUG += $(rtpp_refproxy_AUTOSRCS)
61+
rtpp_wref_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_wref_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_wref_fin.c
62+
SRCS_AUTOGEN_DEBUG += $(rtpp_wref_AUTOSRCS)
6163
rtpp_command_reply_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_command_reply_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_command_reply_fin.c
6264
SRCS_AUTOGEN_DEBUG += $(rtpp_command_reply_AUTOSRCS)
6365
rtpp_genuid_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_genuid_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_genuid_fin.c
6466
SRCS_AUTOGEN_DEBUG += $(rtpp_genuid_AUTOSRCS)
6567
rtpp_bindaddrs_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_bindaddrs_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_bindaddrs_fin.c
6668
SRCS_AUTOGEN_DEBUG += $(rtpp_bindaddrs_AUTOSRCS)
69+
rtpp_packetport_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_packetport_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_packetport_fin.c
70+
SRCS_AUTOGEN_DEBUG += $(rtpp_packetport_AUTOSRCS)

‎autosrc/rtpp_packetport_fin.c‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
/* Auto-generated by genfincode_stat.sh - DO NOT EDIT! */
2+
#include <stdio.h>
3+
#include <stdint.h>
4+
#include <stdlib.h>
5+
#define RTPP_FINCODE
6+
#include "rtpp_types.h"
7+
#include "rtpp_debug.h"
8+
#include "rtpp_packetport.h"
9+
#include "rtpp_packetport_fin.h"
10+
static void rtpp_packetport_next_in_port_fin(void *pub) {
11+
fprintf(stderr, "Method rtpp_packetport_int@%p::next_in_port (rtpp_packetport_next_in_port) is invoked after destruction\x0a", pub);
12+
RTPP_AUTOTRAP();
13+
}
14+
static void rtpp_packetport_next_out_port_fin(void *pub) {
15+
fprintf(stderr, "Method rtpp_packetport_int@%p::next_out_port (rtpp_packetport_next_out_port) is invoked after destruction\x0a", pub);
16+
RTPP_AUTOTRAP();
17+
}
18+
static void rtpp_packetport_reg_stream_fin(void *pub) {
19+
fprintf(stderr, "Method rtpp_packetport_int@%p::reg_stream (rtpp_packetport_reg_stream) is invoked after destruction\x0a", pub);
20+
RTPP_AUTOTRAP();
21+
}
22+
static void rtpp_packetport_reg_streams_fin(void *pub) {
23+
fprintf(stderr, "Method rtpp_packetport_int@%p::reg_streams (rtpp_packetport_reg_streams) is invoked after destruction\x0a", pub);
24+
RTPP_AUTOTRAP();
25+
}
26+
static void rtpp_packetport_send_pkt_na_fin(void *pub) {
27+
fprintf(stderr, "Method rtpp_packetport_int@%p::send_pkt_na (rtpp_packetport_send_pkt_na) is invoked after destruction\x0a", pub);
28+
RTPP_AUTOTRAP();
29+
}
30+
static void rtpp_packetport_unreg_stream_fin(void *pub) {
31+
fprintf(stderr, "Method rtpp_packetport_int@%p::unreg_stream (rtpp_packetport_unreg_stream) is invoked after destruction\x0a", pub);
32+
RTPP_AUTOTRAP();
33+
}
34+
static const struct rtpp_packetport_int_smethods rtpp_packetport_int_smethods_fin = {
35+
.next_in_port = (rtpp_packetport_next_in_port_t)&rtpp_packetport_next_in_port_fin,
36+
.next_out_port = (rtpp_packetport_next_out_port_t)&rtpp_packetport_next_out_port_fin,
37+
.reg_stream = (rtpp_packetport_reg_stream_t)&rtpp_packetport_reg_stream_fin,
38+
.reg_streams = (rtpp_packetport_reg_streams_t)&rtpp_packetport_reg_streams_fin,
39+
.send_pkt_na = (rtpp_packetport_send_pkt_na_t)&rtpp_packetport_send_pkt_na_fin,
40+
.unreg_stream = (rtpp_packetport_unreg_stream_t)&rtpp_packetport_unreg_stream_fin,
41+
};
42+
void rtpp_packetport_int_fin(struct rtpp_packetport_int *pub) {
43+
RTPP_DBG_ASSERT(pub->smethods->next_in_port != (rtpp_packetport_next_in_port_t)NULL);
44+
RTPP_DBG_ASSERT(pub->smethods->next_out_port != (rtpp_packetport_next_out_port_t)NULL);
45+
RTPP_DBG_ASSERT(pub->smethods->reg_stream != (rtpp_packetport_reg_stream_t)NULL);
46+
RTPP_DBG_ASSERT(pub->smethods->reg_streams != (rtpp_packetport_reg_streams_t)NULL);
47+
RTPP_DBG_ASSERT(pub->smethods->send_pkt_na != (rtpp_packetport_send_pkt_na_t)NULL);
48+
RTPP_DBG_ASSERT(pub->smethods->unreg_stream != (rtpp_packetport_unreg_stream_t)NULL);
49+
RTPP_DBG_ASSERT(pub->smethods != &rtpp_packetport_int_smethods_fin &&
50+
pub->smethods != NULL);
51+
pub->smethods = &rtpp_packetport_int_smethods_fin;
52+
}
53+
#if defined(RTPP_FINTEST)
54+
#include <assert.h>
55+
#include <stddef.h>
56+
#include "rtpp_mallocs.h"
57+
#include "rtpp_refcnt.h"
58+
#include "rtpp_linker_set.h"
59+
#define CALL_TFIN(pub, fn) ((void (*)(typeof(pub)))((pub)->smethods->fn))(pub)
60+
61+
void
62+
rtpp_packetport_int_fintest()
63+
{
64+
int naborts_s;
65+
66+
struct {
67+
struct rtpp_packetport_int pub;
68+
} *tp;
69+
70+
naborts_s = _naborts;
71+
tp = rtpp_rzmalloc(sizeof(*tp), offsetof(typeof(*tp), pub.rcnt));
72+
assert(tp != NULL);
73+
assert(tp->pub.rcnt != NULL);
74+
static const struct rtpp_packetport_int_smethods dummy = {
75+
.next_in_port = (rtpp_packetport_next_in_port_t)((void *)0x1),
76+
.next_out_port = (rtpp_packetport_next_out_port_t)((void *)0x1),
77+
.reg_stream = (rtpp_packetport_reg_stream_t)((void *)0x1),
78+
.reg_streams = (rtpp_packetport_reg_streams_t)((void *)0x1),
79+
.send_pkt_na = (rtpp_packetport_send_pkt_na_t)((void *)0x1),
80+
.unreg_stream = (rtpp_packetport_unreg_stream_t)((void *)0x1),
81+
};
82+
tp->pub.smethods = &dummy;
83+
RTPP_OBJ_DTOR_ATTACH_s(&tp->pub, (rtpp_refcnt_dtor_t)&rtpp_packetport_int_fin,
84+
&tp->pub);
85+
RTPP_OBJ_DECREF(&(tp->pub));
86+
CALL_TFIN(&tp->pub, next_in_port);
87+
CALL_TFIN(&tp->pub, next_out_port);
88+
CALL_TFIN(&tp->pub, reg_stream);
89+
CALL_TFIN(&tp->pub, reg_streams);
90+
CALL_TFIN(&tp->pub, send_pkt_na);
91+
CALL_TFIN(&tp->pub, unreg_stream);
92+
assert((_naborts - naborts_s) == 6);
93+
}
94+
DATA_SET(rtpp_fintests, rtpp_packetport_int_fintest);
95+
#endif /* RTPP_FINTEST */

‎autosrc/rtpp_packetport_fin.h‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/* Auto-generated by genfincode_stat.sh - DO NOT EDIT! */
2+
#if !defined(_rtpp_packetport_fin_h)
3+
#define _rtpp_packetport_fin_h
4+
#if !defined(RTPP_AUTOTRAP)
5+
#define RTPP_AUTOTRAP() abort()
6+
#else
7+
extern int _naborts;
8+
#endif
9+
#if defined(RTPP_DEBUG)
10+
struct rtpp_packetport_int;
11+
void rtpp_packetport_int_fin(struct rtpp_packetport_int *);
12+
#else
13+
#define rtpp_packetport_int_fin(arg) /* nop */
14+
#endif
15+
#if defined(RTPP_FINTEST)
16+
void rtpp_packetport_int_fintest(void);
17+
#endif /* RTPP_FINTEST */
18+
#endif /* _rtpp_packetport_fin_h */

‎autosrc/rtpp_refcnt_fin.c‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ static void refcnt_traceen_fin(void *pub) {
4343
fprintf(stderr, "Method rtpp_refcnt@%p::traceen (refcnt_traceen) is invoked after destruction\x0a", pub);
4444
RTPP_AUTOTRAP();
4545
}
46+
static void refcnt_tryincref_fin(void *pub) {
47+
fprintf(stderr, "Method rtpp_refcnt@%p::tryincref (refcnt_tryincref) is invoked after destruction\x0a", pub);
48+
RTPP_AUTOTRAP();
49+
}
4650
static const struct rtpp_refcnt_smethods rtpp_refcnt_smethods_fin = {
4751
.attach = (refcnt_attach_t)&refcnt_attach_fin,
4852
.attach_nc = (refcnt_attach_nc_t)&refcnt_attach_nc_fin,
@@ -53,6 +57,7 @@ static const struct rtpp_refcnt_smethods rtpp_refcnt_smethods_fin = {
5357
.incref = (refcnt_incref_t)&refcnt_incref_fin,
5458
.peek = (refcnt_peek_t)&refcnt_peek_fin,
5559
.traceen = (refcnt_traceen_t)&refcnt_traceen_fin,
60+
.tryincref = (refcnt_tryincref_t)&refcnt_tryincref_fin,
5661
};
5762
void rtpp_refcnt_fin(struct rtpp_refcnt *pub) {
5863
RTPP_DBG_ASSERT(pub->smethods->attach != (refcnt_attach_t)NULL);
@@ -64,6 +69,7 @@ void rtpp_refcnt_fin(struct rtpp_refcnt *pub) {
6469
RTPP_DBG_ASSERT(pub->smethods->incref != (refcnt_incref_t)NULL);
6570
RTPP_DBG_ASSERT(pub->smethods->peek != (refcnt_peek_t)NULL);
6671
RTPP_DBG_ASSERT(pub->smethods->traceen != (refcnt_traceen_t)NULL);
72+
RTPP_DBG_ASSERT(pub->smethods->tryincref != (refcnt_tryincref_t)NULL);
6773
RTPP_DBG_ASSERT(pub->smethods != &rtpp_refcnt_smethods_fin &&
6874
pub->smethods != NULL);
6975
pub->smethods = &rtpp_refcnt_smethods_fin;
@@ -99,6 +105,7 @@ rtpp_refcnt_fintest()
99105
.incref = (refcnt_incref_t)((void *)0x1),
100106
.peek = (refcnt_peek_t)((void *)0x1),
101107
.traceen = (refcnt_traceen_t)((void *)0x1),
108+
.tryincref = (refcnt_tryincref_t)((void *)0x1),
102109
};
103110
tp->pub.smethods = &dummy;
104111
RTPP_OBJ_DTOR_ATTACH_s(&tp->pub, (rtpp_refcnt_dtor_t)&rtpp_refcnt_fin,
@@ -113,7 +120,8 @@ rtpp_refcnt_fintest()
113120
CALL_TFIN(&tp->pub, incref);
114121
CALL_TFIN(&tp->pub, peek);
115122
CALL_TFIN(&tp->pub, traceen);
116-
assert((_naborts - naborts_s) == 9);
123+
CALL_TFIN(&tp->pub, tryincref);
124+
assert((_naborts - naborts_s) == 10);
117125
}
118126
DATA_SET(rtpp_fintests, rtpp_refcnt_fintest);
119127
#endif /* RTPP_FINTEST */

‎autosrc/rtpp_socket_fin.c‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ static void rtpp_socket_drain_fin(void *pub) {
1515
fprintf(stderr, "Method rtpp_socket@%p::drain (rtpp_socket_drain) is invoked after destruction\x0a", pub);
1616
RTPP_AUTOTRAP();
1717
}
18+
static void rtpp_socket_get_session_link_fin(void *pub) {
19+
fprintf(stderr, "Method rtpp_socket@%p::get_session_link (rtpp_socket_get_session_link) is invoked after destruction\x0a", pub);
20+
RTPP_AUTOTRAP();
21+
}
22+
static void rtpp_socket_get_stream_link_fin(void *pub) {
23+
fprintf(stderr, "Method rtpp_socket@%p::get_stream_link (rtpp_socket_get_stream_link) is invoked after destruction\x0a", pub);
24+
RTPP_AUTOTRAP();
25+
}
1826
static void rtpp_socket_get_stuid_fin(void *pub) {
1927
fprintf(stderr, "Method rtpp_socket@%p::get_stuid (rtpp_socket_get_stuid) is invoked after destruction\x0a", pub);
2028
RTPP_AUTOTRAP();
@@ -23,6 +31,14 @@ static void rtpp_socket_getfd_fin(void *pub) {
2331
fprintf(stderr, "Method rtpp_socket@%p::getfd (rtpp_socket_getfd) is invoked after destruction\x0a", pub);
2432
RTPP_AUTOTRAP();
2533
}
34+
static void rtpp_socket_link_session_fin(void *pub) {
35+
fprintf(stderr, "Method rtpp_socket@%p::link_session (rtpp_socket_link_session) is invoked after destruction\x0a", pub);
36+
RTPP_AUTOTRAP();
37+
}
38+
static void rtpp_socket_link_stream_fin(void *pub) {
39+
fprintf(stderr, "Method rtpp_socket@%p::link_stream (rtpp_socket_link_stream) is invoked after destruction\x0a", pub);
40+
RTPP_AUTOTRAP();
41+
}
2642
static void rtpp_socket_rtp_recv_fin(void *pub) {
2743
fprintf(stderr, "Method rtpp_socket@%p::rtp_recv (rtpp_socket_rtp_recv) is invoked after destruction\x0a", pub);
2844
RTPP_AUTOTRAP();
@@ -54,8 +70,12 @@ static void rtpp_socket_settos_fin(void *pub) {
5470
static const struct rtpp_socket_smethods rtpp_socket_smethods_fin = {
5571
.bind2 = (rtpp_socket_bind_t)&rtpp_socket_bind_fin,
5672
.drain = (rtpp_socket_drain_t)&rtpp_socket_drain_fin,
73+
.get_session_link = (rtpp_socket_get_session_link_t)&rtpp_socket_get_session_link_fin,
74+
.get_stream_link = (rtpp_socket_get_stream_link_t)&rtpp_socket_get_stream_link_fin,
5775
.get_stuid = (rtpp_socket_get_stuid_t)&rtpp_socket_get_stuid_fin,
5876
.getfd = (rtpp_socket_getfd_t)&rtpp_socket_getfd_fin,
77+
.link_session = (rtpp_socket_link_session_t)&rtpp_socket_link_session_fin,
78+
.link_stream = (rtpp_socket_link_stream_t)&rtpp_socket_link_stream_fin,
5979
.rtp_recv = (rtpp_socket_rtp_recv_t)&rtpp_socket_rtp_recv_fin,
6080
.send_pkt_na = (rtpp_socket_send_pkt_na_t)&rtpp_socket_send_pkt_na_fin,
6181
.set_stuid = (rtpp_socket_set_stuid_t)&rtpp_socket_set_stuid_fin,
@@ -67,8 +87,12 @@ static const struct rtpp_socket_smethods rtpp_socket_smethods_fin = {
6787
void rtpp_socket_fin(struct rtpp_socket *pub) {
6888
RTPP_DBG_ASSERT(pub->smethods->bind2 != (rtpp_socket_bind_t)NULL);
6989
RTPP_DBG_ASSERT(pub->smethods->drain != (rtpp_socket_drain_t)NULL);
90+
RTPP_DBG_ASSERT(pub->smethods->get_session_link != (rtpp_socket_get_session_link_t)NULL);
91+
RTPP_DBG_ASSERT(pub->smethods->get_stream_link != (rtpp_socket_get_stream_link_t)NULL);
7092
RTPP_DBG_ASSERT(pub->smethods->get_stuid != (rtpp_socket_get_stuid_t)NULL);
7193
RTPP_DBG_ASSERT(pub->smethods->getfd != (rtpp_socket_getfd_t)NULL);
94+
RTPP_DBG_ASSERT(pub->smethods->link_session != (rtpp_socket_link_session_t)NULL);
95+
RTPP_DBG_ASSERT(pub->smethods->link_stream != (rtpp_socket_link_stream_t)NULL);
7296
RTPP_DBG_ASSERT(pub->smethods->rtp_recv != (rtpp_socket_rtp_recv_t)NULL);
7397
RTPP_DBG_ASSERT(pub->smethods->send_pkt_na != (rtpp_socket_send_pkt_na_t)NULL);
7498
RTPP_DBG_ASSERT(pub->smethods->set_stuid != (rtpp_socket_set_stuid_t)NULL);
@@ -104,8 +128,12 @@ rtpp_socket_fintest()
104128
static const struct rtpp_socket_smethods dummy = {
105129
.bind2 = (rtpp_socket_bind_t)((void *)0x1),
106130
.drain = (rtpp_socket_drain_t)((void *)0x1),
131+
.get_session_link = (rtpp_socket_get_session_link_t)((void *)0x1),
132+
.get_stream_link = (rtpp_socket_get_stream_link_t)((void *)0x1),
107133
.get_stuid = (rtpp_socket_get_stuid_t)((void *)0x1),
108134
.getfd = (rtpp_socket_getfd_t)((void *)0x1),
135+
.link_session = (rtpp_socket_link_session_t)((void *)0x1),
136+
.link_stream = (rtpp_socket_link_stream_t)((void *)0x1),
109137
.rtp_recv = (rtpp_socket_rtp_recv_t)((void *)0x1),
110138
.send_pkt_na = (rtpp_socket_send_pkt_na_t)((void *)0x1),
111139
.set_stuid = (rtpp_socket_set_stuid_t)((void *)0x1),
@@ -120,16 +148,20 @@ rtpp_socket_fintest()
120148
RTPP_OBJ_DECREF(&(tp->pub));
121149
CALL_TFIN(&tp->pub, bind2);
122150
CALL_TFIN(&tp->pub, drain);
151+
CALL_TFIN(&tp->pub, get_session_link);
152+
CALL_TFIN(&tp->pub, get_stream_link);
123153
CALL_TFIN(&tp->pub, get_stuid);
124154
CALL_TFIN(&tp->pub, getfd);
155+
CALL_TFIN(&tp->pub, link_session);
156+
CALL_TFIN(&tp->pub, link_stream);
125157
CALL_TFIN(&tp->pub, rtp_recv);
126158
CALL_TFIN(&tp->pub, send_pkt_na);
127159
CALL_TFIN(&tp->pub, set_stuid);
128160
CALL_TFIN(&tp->pub, setnonblock);
129161
CALL_TFIN(&tp->pub, setrbuf);
130162
CALL_TFIN(&tp->pub, settimestamp);
131163
CALL_TFIN(&tp->pub, settos);
132-
assert((_naborts - naborts_s) == 11);
164+
assert((_naborts - naborts_s) == 15);
133165
}
134166
DATA_SET(rtpp_fintests, rtpp_socket_fintest);
135167
#endif /* RTPP_FINTEST */

‎autosrc/rtpp_stream_fin.c‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ static void rtpp_stream_get_actor_fin(void *pub) {
1515
fprintf(stderr, "Method rtpp_stream@%p::get_actor (rtpp_stream_get_actor) is invoked after destruction\x0a", pub);
1616
RTPP_AUTOTRAP();
1717
}
18+
static void rtpp_stream_get_packetport_fin(void *pub) {
19+
fprintf(stderr, "Method rtpp_stream@%p::get_packetport (rtpp_stream_get_packetport) is invoked after destruction\x0a", pub);
20+
RTPP_AUTOTRAP();
21+
}
1822
static void rtpp_stream_get_proto_fin(void *pub) {
1923
fprintf(stderr, "Method rtpp_stream@%p::get_proto (rtpp_stream_get_proto) is invoked after destruction\x0a", pub);
2024
RTPP_AUTOTRAP();
@@ -91,17 +95,26 @@ static void rtpp_stream_send_pkt_to_fin(void *pub) {
9195
fprintf(stderr, "Method rtpp_stream@%p::send_pkt_to (rtpp_stream_send_pkt_to) is invoked after destruction\x0a", pub);
9296
RTPP_AUTOTRAP();
9397
}
98+
static void rtpp_stream_set_packetport_fin(void *pub) {
99+
fprintf(stderr, "Method rtpp_stream@%p::set_packetport (rtpp_stream_set_packetport) is invoked after destruction\x0a", pub);
100+
RTPP_AUTOTRAP();
101+
}
94102
static void rtpp_stream_set_skt_fin(void *pub) {
95103
fprintf(stderr, "Method rtpp_stream@%p::set_skt (rtpp_stream_set_skt) is invoked after destruction\x0a", pub);
96104
RTPP_AUTOTRAP();
97105
}
106+
static void rtpp_stream_unreg_fin(void *pub) {
107+
fprintf(stderr, "Method rtpp_stream@%p::unreg (rtpp_stream_unreg) is invoked after destruction\x0a", pub);
108+
RTPP_AUTOTRAP();
109+
}
98110
static void rtpp_stream_update_skt_fin(void *pub) {
99111
fprintf(stderr, "Method rtpp_stream@%p::update_skt (rtpp_stream_update_skt) is invoked after destruction\x0a", pub);
100112
RTPP_AUTOTRAP();
101113
}
102114
static const struct rtpp_stream_smethods rtpp_stream_smethods_fin = {
103115
.finish_playback = (rtpp_stream_finish_playback_t)&rtpp_stream_finish_playback_fin,
104116
.get_actor = (rtpp_stream_get_actor_t)&rtpp_stream_get_actor_fin,
117+
.get_packetport = (rtpp_stream_get_packetport_t)&rtpp_stream_get_packetport_fin,
105118
.get_proto = (rtpp_stream_get_proto_t)&rtpp_stream_get_proto_fin,
106119
.get_rem_addr = (rtpp_stream_get_rem_addr_t)&rtpp_stream_get_rem_addr_fin,
107120
.get_sender = (rtpp_stream_get_sender_t)&rtpp_stream_get_sender_fin,
@@ -121,12 +134,15 @@ static const struct rtpp_stream_smethods rtpp_stream_smethods_fin = {
121134
.rx = (rtpp_stream_rx_t)&rtpp_stream_rx_fin,
122135
.send_pkt = (rtpp_stream_send_pkt_t)&rtpp_stream_send_pkt_fin,
123136
.send_pkt_to = (rtpp_stream_send_pkt_to_t)&rtpp_stream_send_pkt_to_fin,
137+
.set_packetport = (rtpp_stream_set_packetport_t)&rtpp_stream_set_packetport_fin,
124138
.set_skt = (rtpp_stream_set_skt_t)&rtpp_stream_set_skt_fin,
139+
.unreg = (rtpp_stream_unreg_t)&rtpp_stream_unreg_fin,
125140
.update_skt = (rtpp_stream_update_skt_t)&rtpp_stream_update_skt_fin,
126141
};
127142
void rtpp_stream_fin(struct rtpp_stream *pub) {
128143
RTPP_DBG_ASSERT(pub->smethods->finish_playback != (rtpp_stream_finish_playback_t)NULL);
129144
RTPP_DBG_ASSERT(pub->smethods->get_actor != (rtpp_stream_get_actor_t)NULL);
145+
RTPP_DBG_ASSERT(pub->smethods->get_packetport != (rtpp_stream_get_packetport_t)NULL);
130146
RTPP_DBG_ASSERT(pub->smethods->get_proto != (rtpp_stream_get_proto_t)NULL);
131147
RTPP_DBG_ASSERT(pub->smethods->get_rem_addr != (rtpp_stream_get_rem_addr_t)NULL);
132148
RTPP_DBG_ASSERT(pub->smethods->get_sender != (rtpp_stream_get_sender_t)NULL);
@@ -146,7 +162,9 @@ void rtpp_stream_fin(struct rtpp_stream *pub) {
146162
RTPP_DBG_ASSERT(pub->smethods->rx != (rtpp_stream_rx_t)NULL);
147163
RTPP_DBG_ASSERT(pub->smethods->send_pkt != (rtpp_stream_send_pkt_t)NULL);
148164
RTPP_DBG_ASSERT(pub->smethods->send_pkt_to != (rtpp_stream_send_pkt_to_t)NULL);
165+
RTPP_DBG_ASSERT(pub->smethods->set_packetport != (rtpp_stream_set_packetport_t)NULL);
149166
RTPP_DBG_ASSERT(pub->smethods->set_skt != (rtpp_stream_set_skt_t)NULL);
167+
RTPP_DBG_ASSERT(pub->smethods->unreg != (rtpp_stream_unreg_t)NULL);
150168
RTPP_DBG_ASSERT(pub->smethods->update_skt != (rtpp_stream_update_skt_t)NULL);
151169
RTPP_DBG_ASSERT(pub->smethods != &rtpp_stream_smethods_fin &&
152170
pub->smethods != NULL);
@@ -176,6 +194,7 @@ rtpp_stream_fintest()
176194
static const struct rtpp_stream_smethods dummy = {
177195
.finish_playback = (rtpp_stream_finish_playback_t)((void *)0x1),
178196
.get_actor = (rtpp_stream_get_actor_t)((void *)0x1),
197+
.get_packetport = (rtpp_stream_get_packetport_t)((void *)0x1),
179198
.get_proto = (rtpp_stream_get_proto_t)((void *)0x1),
180199
.get_rem_addr = (rtpp_stream_get_rem_addr_t)((void *)0x1),
181200
.get_sender = (rtpp_stream_get_sender_t)((void *)0x1),
@@ -195,7 +214,9 @@ rtpp_stream_fintest()
195214
.rx = (rtpp_stream_rx_t)((void *)0x1),
196215
.send_pkt = (rtpp_stream_send_pkt_t)((void *)0x1),
197216
.send_pkt_to = (rtpp_stream_send_pkt_to_t)((void *)0x1),
217+
.set_packetport = (rtpp_stream_set_packetport_t)((void *)0x1),
198218
.set_skt = (rtpp_stream_set_skt_t)((void *)0x1),
219+
.unreg = (rtpp_stream_unreg_t)((void *)0x1),
199220
.update_skt = (rtpp_stream_update_skt_t)((void *)0x1),
200221
};
201222
tp->pub.smethods = &dummy;
@@ -204,6 +225,7 @@ rtpp_stream_fintest()
204225
RTPP_OBJ_DECREF(&(tp->pub));
205226
CALL_TFIN(&tp->pub, finish_playback);
206227
CALL_TFIN(&tp->pub, get_actor);
228+
CALL_TFIN(&tp->pub, get_packetport);
207229
CALL_TFIN(&tp->pub, get_proto);
208230
CALL_TFIN(&tp->pub, get_rem_addr);
209231
CALL_TFIN(&tp->pub, get_sender);
@@ -223,9 +245,11 @@ rtpp_stream_fintest()
223245
CALL_TFIN(&tp->pub, rx);
224246
CALL_TFIN(&tp->pub, send_pkt);
225247
CALL_TFIN(&tp->pub, send_pkt_to);
248+
CALL_TFIN(&tp->pub, set_packetport);
226249
CALL_TFIN(&tp->pub, set_skt);
250+
CALL_TFIN(&tp->pub, unreg);
227251
CALL_TFIN(&tp->pub, update_skt);
228-
assert((_naborts - naborts_s) == 23);
252+
assert((_naborts - naborts_s) == 26);
229253
}
230254
DATA_SET(rtpp_fintests, rtpp_stream_fintest);
231255
#endif /* RTPP_FINTEST */

0 commit comments

Comments
 (0)