Skip to content

Unref ports after re-subscribe #2125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
alexbakker wants to merge 1 commit into from
+14 −29
Closed

Unref ports after re-subscribe #2125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions daemon/call.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ static void __assign_stream_fds(struct call_media *media, sfd_intf_list_q *intf_
// use opaque pointer to detect changes
void *old_selected_sfd = ps->selected_sfd;

t_queue_clear(&ps->sfds);
t_queue_clear_full(&ps->sfds, stream_fd_dec);
bool sfd_found = false;
stream_fd *intf_sfd = NULL;

Expand Down Expand Up @@ -3541,10 +3541,12 @@ static void monologue_bundle_set_fds(struct call_monologue *ml) {
dtls_shutdown(ms);

// XXX close sockets that are not needed?
t_queue_clear(&ms->sfds);
t_queue_clear_full(&ms->sfds, stream_fd_dec);

for (__auto_type sl = bs->sfds.head; sl; sl = sl->next)
for (__auto_type sl = bs->sfds.head; sl; sl = sl->next) {
stream_fd_inc(sl->data);
t_queue_push_tail(&ms->sfds, sl->data);
}

ms->selected_sfd = bs->selected_sfd;

Expand Down
6 changes: 5 additions & 1 deletion perl/NGCP/Rtpengine/AutoTest.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ our $port;
BEGIN {
require Exporter;
@ISA = qw(Exporter);
our @EXPORT = qw(autotest_start new_call new_call_nc offer answer ft tt cid snd srtp_snd rtp rcv srtp_rcv rcv_no rcv_maybe
our @EXPORT = qw(autotest_start new_call new_call_nc offer answer ft tt cid snd snd_no srtp_snd rtp rcv srtp_rcv rcv_no rcv_maybe
srtp_dec escape rtpm rtpmre reverse_tags new_ft new_tt crlf sdp_split rtpe_req offer_answer
autotest_init subscribe_request subscribe_answer publish create create_answer
use_json rtpe_raw_req);
Expand Down Expand Up @@ -223,6 +223,10 @@ sub snd {
my ($sock, $dest, $packet, $addr) = @_;
$sock->send($packet, 0, pack_sockaddr_in($dest, inet_aton($addr // '203.0.113.1'))) or die;
}
sub snd_no {
my ($sock, $dest, $packet, $addr) = @_;
ok(!$sock->send($packet, 0, pack_sockaddr_in($dest, inet_aton($addr // '203.0.113.1'))), "send to closed port fails");
}
sub srtp_snd {
my ($sock, $dest, $packet, $srtp_ctx, $addr) = @_;
if (!$srtp_ctx->{skey}) {
Expand Down
29 changes: 4 additions & 25 deletions t/auto-daemon-tests-alias.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,19 +227,8 @@
rcv_no($sock_c);
rcv_no($sock_d);


snd($sock_c, $port_d, rtp (0, 5002, 7320, 0x1234, "\x33" x 160));
rcv_no($sock_a);
rcv_no($sock_b);
rcv_no($sock_c);
rcv_no($sock_d);

snd($sock_d, $port_c, rtp (0, 7002, 9320, 0x1a04, "\x44" x 160));
rcv_no($sock_a);
rcv_no($sock_b);
rcv_no($sock_c);
rcv_no($sock_d);

snd_no($sock_c, $port_d, rtp (0, 5002, 7320, 0x1234, "\x33" x 160));
snd_no($sock_d, $port_c, rtp (0, 7002, 9320, 0x1a04, "\x44" x 160));



Expand Down Expand Up @@ -429,18 +418,8 @@

rtpe_req('delete', 'delete alias rev', { 'call-id' => $cid1, 'delete-delay' => 0 });

snd($sock_a, $port_b, rtp (0, 1002, 3320, 0x1234, "\x11" x 160));
rcv_no($sock_a);
rcv_no($sock_b);
rcv_no($sock_c);
rcv_no($sock_d);

snd($sock_b, $port_a, rtp (0, 3002, 5320, 0x1a04, "\x22" x 160));
rcv_no($sock_a);
rcv_no($sock_b);
rcv_no($sock_c);
rcv_no($sock_d);

snd_no($sock_a, $port_b, rtp (0, 1002, 3320, 0x1234, "\x11" x 160));
snd_no($sock_b, $port_a, rtp (0, 3002, 5320, 0x1a04, "\x22" x 160));

snd($sock_c, $port_d, rtp (0, 5002, 7320, 0x1234, "\x33" x 160));
rcv($sock_d, $port_c, rtpm(0, 5002, 7320, 0x1234, "\x33" x 160));
Expand Down
Loading