sipwise
/
rtpengine
mirror of https://github.com/sipwise/rtpengine.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#55283 remove unused DEL_STREAM

Browse Source 
Change-Id: Ie4cc5d55b93038a246a5038ace1d7a3d4edcce84
pull/2123/head
Richard Fuchs 2 months ago
parent 7a4feef1ff
commit fd057cc020
5 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File

1
daemon/kernel.c
Unescape View File

@ -142,7 +142,6 @@ bool kernel_init_table(void) {
[REMG_ADD_CALL] = sizeof(struct rtpengine_command_add_call),
[REMG_DEL_CALL] = sizeof(struct rtpengine_command_del_call),
[REMG_ADD_STREAM] = sizeof(struct rtpengine_command_add_stream),
[REMG_DEL_STREAM] = sizeof(struct rtpengine_command_del_stream),
[REMG_PACKET] = sizeof(struct rtpengine_command_packet),
[REMG_INIT_PLAY_STREAMS] = sizeof(struct rtpengine_command_init_play_streams),
[REMG_GET_PACKET_STREAM] = sizeof(struct rtpengine_command_get_packet_stream),

34
kernel-module/nft_rtpengine.c
Unescape View File

@ -3586,34 +3586,6 @@ static void del_stream(struct re_stream *stream, struct rtpengine_table *table)
stream_put(stream);
}
static int table_del_stream(struct rtpengine_table *table, const struct rtpengine_stream_idx_info *info) {
int err;
struct re_call *call;
struct re_stream *stream;
DBG("table_del_stream()\n");
call = get_call_lock(table, info->call_idx);
err = -ENOENT;
if (!call)
return -ENOENT;
stream = get_stream_lock(call, info->stream_idx);
err = -ENOENT;
if (!stream)
goto out;
del_stream(stream, table);
err = 0;
out:
call_put(call);
return err;
}
static ssize_t proc_stream_read(struct file *f, char __user *b, size_t l, loff_t *o) {
struct re_stream *stream = f->private_data;
@ -5144,7 +5116,6 @@ static const size_t min_req_sizes[__REMG_LAST] = {
[REMG_ADD_CALL] = sizeof(struct rtpengine_command_add_call),
[REMG_DEL_CALL] = sizeof(struct rtpengine_command_del_call),
[REMG_ADD_STREAM] = sizeof(struct rtpengine_command_add_stream),
[REMG_DEL_STREAM] = sizeof(struct rtpengine_command_del_stream),
[REMG_PACKET] = sizeof(struct rtpengine_command_packet),
[REMG_INIT_PLAY_STREAMS]= sizeof(struct rtpengine_command_init_play_streams),
[REMG_GET_PACKET_STREAM]= sizeof(struct rtpengine_command_get_packet_stream),
@ -5164,7 +5135,6 @@ static const size_t max_req_sizes[__REMG_LAST] = {
[REMG_ADD_CALL] = sizeof(struct rtpengine_command_add_call),
[REMG_DEL_CALL] = sizeof(struct rtpengine_command_del_call),
[REMG_ADD_STREAM] = sizeof(struct rtpengine_command_add_stream),
[REMG_DEL_STREAM] = sizeof(struct rtpengine_command_del_stream),
[REMG_PACKET] = sizeof(struct rtpengine_command_packet) + 65535,
[REMG_INIT_PLAY_STREAMS]= sizeof(struct rtpengine_command_init_play_streams),
[REMG_GET_PACKET_STREAM]= sizeof(struct rtpengine_command_get_packet_stream),
@ -5304,10 +5274,6 @@ static inline ssize_t proc_control_read_write(struct file *file, char __user *ub
err = table_new_stream(t, &msg.add_stream->stream);
break;
case REMG_DEL_STREAM:
err = table_del_stream(t, &msg.del_stream->stream);
break;
case REMG_PACKET:
err = stream_packet(t, &msg.packet->packet, buflen - sizeof(*msg.packet));
break;

2
kernel-module/nft_rtpengine.h
Unescape View File

@ -213,7 +213,7 @@ enum rtpengine_command {
REMG_ADD_CALL,
REMG_DEL_CALL,
REMG_ADD_STREAM,
REMG_DEL_STREAM,
__REMG_UNSUED_1, // REMG_DEL_STREAM,
REMG_PACKET,
REMG_DEL_TARGET,
REMG_INIT_PLAY_STREAMS,

1
utils/kplay-test.c
Unescape View File

@ -34,7 +34,6 @@ int main() {
[REMG_ADD_CALL] = sizeof(struct rtpengine_command_add_call),
[REMG_DEL_CALL] = sizeof(struct rtpengine_command_del_call),
[REMG_ADD_STREAM] = sizeof(struct rtpengine_command_add_stream),
[REMG_DEL_STREAM] = sizeof(struct rtpengine_command_del_stream),
[REMG_PACKET] = sizeof(struct rtpengine_command_packet),
[REMG_INIT_PLAY_STREAMS] = sizeof(struct rtpengine_command_init_play_streams),
[REMG_GET_PACKET_STREAM] = sizeof(struct rtpengine_command_get_packet_stream),

1
utils/kplay-test2.c
Unescape View File

@ -41,7 +41,6 @@ int main() {
[REMG_ADD_CALL] = sizeof(struct rtpengine_command_add_call),
[REMG_DEL_CALL] = sizeof(struct rtpengine_command_del_call),
[REMG_ADD_STREAM] = sizeof(struct rtpengine_command_add_stream),
[REMG_DEL_STREAM] = sizeof(struct rtpengine_command_del_stream),
[REMG_PACKET] = sizeof(struct rtpengine_command_packet),
[REMG_INIT_PLAY_STREAMS] = sizeof(struct rtpengine_command_init_play_streams),
[REMG_GET_PACKET_STREAM] = sizeof(struct rtpengine_command_get_packet_stream),

Write Preview
Loading…
Cancel
Save