author | Nils Ohlmeier [:drno] <drno@ohlmeier.org> |
Fri, 23 Jan 2015 13:47:00 +0100 | |
changeset 226977 | 6156b3b5f1e6abfe48b89c3f0497bead255abae4 |
parent 226976 | 993b90fb20c9310436ebf413e5e9fab13520c717 |
child 226978 | 72073b4271d4d3a57365de5d69bcaaa0784f95c2 |
push id | 54975 |
push user | cbook@mozilla.com |
push date | Mon, 02 Feb 2015 08:02:01 +0000 |
treeherder | mozilla-inbound@645f4595673d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bwc |
bugs | 1120065 |
milestone | 38.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/media/mtransport/third_party/nICEr/src/ice/ice_candidate.c +++ b/media/mtransport/third_party/nICEr/src/ice/ice_candidate.c @@ -287,22 +287,16 @@ int nr_ice_candidate_destroy(nr_ice_cand RFREE(cand->foundation); RFREE(cand->label); RFREE(cand); return(0); } -void nr_ice_candidate_destroy_cb(NR_SOCKET s, int h, void *cb_arg) - { - nr_ice_candidate *cand=cb_arg; - nr_ice_candidate_destroy(&cand); - } - /* This algorithm is not super-fast, but I don't think we need a hash table just yet and it produces a small foundation string */ static int nr_ice_get_foundation(nr_ice_ctx *ctx,nr_ice_candidate *cand) { nr_ice_foundation *foundation; int i=0; char fnd[20]; int _status;
--- a/media/mtransport/third_party/nICEr/src/ice/ice_candidate.h +++ b/media/mtransport/third_party/nICEr/src/ice/ice_candidate.h @@ -99,17 +99,16 @@ struct nr_ice_candidate_ { extern char *nr_ice_candidate_type_names[]; int nr_ice_candidate_create(struct nr_ice_ctx_ *ctx,nr_ice_component *component, nr_ice_socket *isock, nr_socket *osock, nr_ice_candidate_type ctype, nr_ice_stun_server *stun_server, UCHAR component_id, nr_ice_candidate **candp); int nr_ice_candidate_initialize(nr_ice_candidate *cand, NR_async_cb ready_cb, void *cb_arg); void nr_ice_candidate_compute_codeword(nr_ice_candidate *cand); int nr_ice_candidate_process_stun(nr_ice_candidate *cand, UCHAR *msg, int len, nr_transport_addr *faddr); int nr_ice_candidate_destroy(nr_ice_candidate **candp); -void nr_ice_candidate_destroy_cb(NR_SOCKET s, int h, void *cb_arg); int nr_ice_format_candidate_attribute(nr_ice_candidate *cand, char *attr, int maxlen); int nr_ice_peer_candidate_from_attribute(nr_ice_ctx *ctx,char *attr,nr_ice_media_stream *stream,nr_ice_candidate **candp); int nr_ice_peer_peer_rflx_candidate_create(nr_ice_ctx *ctx,char *label, nr_ice_component *comp,nr_transport_addr *addr, nr_ice_candidate **candp); int nr_ice_candidate_compute_priority(nr_ice_candidate *cand); #ifdef __cplusplus } #endif /* __cplusplus */