Browse Source

TT#145450 properly namespace kernel module defines

Change-Id: I1c7f76416b00c79384528f508694ab7ca7bc7280
pull/1388/head
Richard Fuchs 4 years ago
parent
commit
eaec8cb2c2
2 changed files with 7 additions and 7 deletions
  1. +2
    -2
      kernel-module/xt_RTPENGINE.c
  2. +5
    -5
      kernel-module/xt_RTPENGINE.h

+ 2
- 2
kernel-module/xt_RTPENGINE.c View File

@ -301,7 +301,7 @@ struct rtpengine_target {
struct rtpengine_target_info target;
struct rtpengine_stats_a stats;
struct rtpengine_rtp_stats_a rtp_stats[NUM_PAYLOAD_TYPES];
struct rtpengine_rtp_stats_a rtp_stats[RTPE_NUM_PAYLOAD_TYPES];
spinlock_t ssrc_stats_lock;
struct rtpengine_ssrc_stats ssrc_stats;
@ -2247,7 +2247,7 @@ static int table_new_target(struct rtpengine_table *t, struct rtpengine_target_i
if (!is_valid_address(&i->local))
return -EINVAL;
if (i->num_destinations > MAX_FORWARD_DESTINATIONS)
if (i->num_destinations > RTPE_MAX_FORWARD_DESTINATIONS)
return -EINVAL;
if (!i->non_forwarding) {
if (!i->num_destinations)


+ 5
- 5
kernel-module/xt_RTPENGINE.h View File

@ -3,8 +3,8 @@
#define NUM_PAYLOAD_TYPES 32
#define MAX_FORWARD_DESTINATIONS 32
#define RTPE_NUM_PAYLOAD_TYPES 32
#define RTPE_MAX_FORWARD_DESTINATIONS 32
@ -109,7 +109,7 @@ struct rtpengine_target_info {
struct rtpengine_srtp decrypt;
uint32_t ssrc; // Expose the SSRC to userspace when we resync.
struct rtpengine_payload_type payload_types[NUM_PAYLOAD_TYPES]; /* must be sorted */
struct rtpengine_payload_type payload_types[RTPE_NUM_PAYLOAD_TYPES]; /* must be sorted */
unsigned int num_payload_types;
unsigned int rtcp_mux:1,
@ -214,8 +214,8 @@ struct rtpengine_message {
struct rtpengine_list_entry {
struct rtpengine_target_info target;
struct rtpengine_stats stats;
struct rtpengine_rtp_stats rtp_stats[NUM_PAYLOAD_TYPES];
struct rtpengine_output_info outputs[MAX_FORWARD_DESTINATIONS];
struct rtpengine_rtp_stats rtp_stats[RTPE_NUM_PAYLOAD_TYPES];
struct rtpengine_output_info outputs[RTPE_MAX_FORWARD_DESTINATIONS];
};


Loading…
Cancel
Save