Browse Source

MT#55283 remove useless struct member

Change-Id: Ia599a96515d2c2c1a56972aaa7bfae342168ac05
pull/1614/head
Richard Fuchs 3 years ago
parent
commit
410a277f50
2 changed files with 0 additions and 16 deletions
  1. +0
    -3
      daemon/media_socket.c
  2. +0
    -13
      include/media_socket.h

+ 0
- 3
daemon/media_socket.c View File

@ -697,7 +697,6 @@ static void __interface_append(struct intf_config *ifa, sockfamily_t *fam, bool
lif->name = ifa->name; lif->name = ifa->name;
lif->name_base = ifa->name_base; lif->name_base = ifa->name_base;
lif->preferred_family = fam; lif->preferred_family = fam;
lif->addr_hash = g_hash_table_new(__addr_type_hash, __addr_type_eq);
lif->rr_specs = g_hash_table_new(str_hash, str_equal); lif->rr_specs = g_hash_table_new(str_hash, str_equal);
g_hash_table_insert(__logical_intf_name_family_hash, lif, lif); g_hash_table_insert(__logical_intf_name_family_hash, lif, lif);
if (ifa->local_address.addr.family == fam) { if (ifa->local_address.addr.family == fam) {
@ -724,7 +723,6 @@ static void __interface_append(struct intf_config *ifa, sockfamily_t *fam, bool
ifc->spec = spec; ifc->spec = spec;
ifc->logical = lif; ifc->logical = lif;
g_hash_table_insert(lif->addr_hash, &spec->local_address, ifc);
g_queue_push_tail(&all_local_interfaces, ifc); g_queue_push_tail(&all_local_interfaces, ifc);
__insert_local_intf_addr_type(&spec->local_address, ifc); __insert_local_intf_addr_type(&spec->local_address, ifc);
@ -2932,7 +2930,6 @@ void interfaces_free(void) {
ll = g_hash_table_get_values(__logical_intf_name_family_hash); ll = g_hash_table_get_values(__logical_intf_name_family_hash);
for (GList *l = ll; l; l = l->next) { for (GList *l = ll; l; l = l->next) {
struct logical_intf *lif = l->data; struct logical_intf *lif = l->data;
g_hash_table_destroy(lif->addr_hash);
g_hash_table_destroy(lif->rr_specs); g_hash_table_destroy(lif->rr_specs);
g_queue_clear(&lif->list); g_queue_clear(&lif->list);
g_slice_free1(sizeof(*lif), lif); g_slice_free1(sizeof(*lif), lif);


+ 0
- 13
include/media_socket.h View File

@ -75,7 +75,6 @@ struct logical_intf {
str name; str name;
sockfamily_t *preferred_family; sockfamily_t *preferred_family;
GQueue list; /* struct local_intf */ GQueue list; /* struct local_intf */
GHashTable *addr_hash; // addr + type -> struct local_intf XXX obsolete?
GHashTable *rr_specs; GHashTable *rr_specs;
str name_base; // if name is "foo:bar", this is "foo" str name_base; // if name is "foo:bar", this is "foo"
}; };
@ -257,18 +256,6 @@ const struct transport_protocol *transport_protocol(const str *s);
//void play_buffered(struct packet_stream *sink, struct codec_packet *cp, int buffered); //void play_buffered(struct packet_stream *sink, struct codec_packet *cp, int buffered);
void play_buffered(struct jb_packet *cp); void play_buffered(struct jb_packet *cp);
/* XXX shouldn't be necessary */
/*
INLINE struct local_intf *get_interface_from_address(const struct logical_intf *lif,
const sockaddr_t *addr, socktype_t *type)
{
struct intf_address a;
a.type = type;
a.addr = *addr;
return g_hash_table_lookup(lif->addr_hash, &a);
}
*/
INLINE int proto_is_rtp(const struct transport_protocol *protocol) { INLINE int proto_is_rtp(const struct transport_protocol *protocol) {
// known to be RTP? therefore unknown is not RTP // known to be RTP? therefore unknown is not RTP
if (!protocol) if (!protocol)


Loading…
Cancel
Save