Browse Source

move struct sdp_ng_flags from sdp.h to call_interfaces.h

Change-Id: Icc05655372e8cd7a02cf32b3216391ccf258f28f
pull/214/head
Richard Fuchs 10 years ago
parent
commit
d81c8df3b1
3 changed files with 39 additions and 38 deletions
  1. +38
    -0
      daemon/call_interfaces.h
  2. +1
    -0
      daemon/sdp.c
  3. +0
    -38
      daemon/sdp.h

+ 38
- 0
daemon/call_interfaces.h View File

@ -7,6 +7,7 @@
#include "str.h"
#include "bencode.h"
#include "socket.h"
#include "call.h"
@ -16,6 +17,43 @@ struct callmaster;
struct control_stream;
struct sockaddr_in6;
struct sdp_ng_flags {
enum call_opmode opmode;
str received_from_family;
str received_from_address;
str media_address;
str transport_protocol_str;
str address_family_str;
const struct transport_protocol *transport_protocol;
sockaddr_t parsed_received_from;
sockaddr_t parsed_media_address;
str direction[2];
sockfamily_t *address_family;
int tos;
int asymmetric:1,
trust_address:1,
replace_origin:1,
replace_sess_conn:1,
ice_remove:1,
ice_force:1,
ice_force_relay:1,
rtcp_mux_offer:1,
rtcp_mux_demux:1,
rtcp_mux_accept:1,
rtcp_mux_reject:1,
strict_source:1,
media_handover:1,
dtls_passive:1,
reset:1,
dtls_off:1,
sdes_off:1,
sdes_unencrypted_srtp:1,
sdes_unencrypted_srtcp:1,
sdes_unauthenticated_srtp:1,
sdes_encrypted_srtp:1,
sdes_encrypted_srtcp:1,
sdes_authenticated_srtp:1;
};
extern int trust_address_def;
extern int dtls_passive_def;


+ 1
- 0
daemon/sdp.c View File

@ -16,6 +16,7 @@
#include "rtp.h"
#include "ice.h"
#include "socket.h"
#include "call_interfaces.h"
struct network_address {
str network_type;


+ 0
- 38
daemon/sdp.h View File

@ -7,44 +7,6 @@
#include "media_socket.h"
struct sdp_ng_flags {
enum call_opmode opmode;
str received_from_family;
str received_from_address;
str media_address;
str transport_protocol_str;
str address_family_str;
const struct transport_protocol *transport_protocol;
sockaddr_t parsed_received_from;
sockaddr_t parsed_media_address;
str direction[2];
sockfamily_t *address_family;
int tos;
int asymmetric:1,
trust_address:1,
replace_origin:1,
replace_sess_conn:1,
ice_remove:1,
ice_force:1,
ice_force_relay:1,
rtcp_mux_offer:1,
rtcp_mux_demux:1,
rtcp_mux_accept:1,
rtcp_mux_reject:1,
strict_source:1,
media_handover:1,
dtls_passive:1,
reset:1,
dtls_off:1,
sdes_off:1,
sdes_unencrypted_srtp:1,
sdes_unencrypted_srtcp:1,
sdes_unauthenticated_srtp:1,
sdes_encrypted_srtp:1,
sdes_encrypted_srtcp:1,
sdes_authenticated_srtp:1;
};
struct sdp_chopper {
str *input;
int position;


Loading…
Cancel
Save