diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/dtls_srtp/dtls.c | 13 | ||||
-rw-r--r-- | modules/dtls_srtp/srtp.c | 25 | ||||
-rw-r--r-- | modules/dtls_srtp/tls_udp.c | 18 | ||||
-rw-r--r-- | modules/natbd/natbd.c | 57 | ||||
-rw-r--r-- | modules/srtp/srtp.c | 45 |
5 files changed, 68 insertions, 90 deletions
diff --git a/modules/dtls_srtp/dtls.c b/modules/dtls_srtp/dtls.c index f787cd2..e502903 100644 --- a/modules/dtls_srtp/dtls.c +++ b/modules/dtls_srtp/dtls.c @@ -12,11 +12,6 @@ #include "dtls_srtp.h" -#define DEBUG_MODULE "dtls_srtp" -#define DEBUG_LEVEL 5 -#include <re_dbg.h> - - /* note: shadow struct in libre's tls module */ struct tls { SSL_CTX *ctx; @@ -157,8 +152,8 @@ int dtls_alloc_selfsigned(struct tls **tlsp, const char *aor, /* Generate self-signed certificate */ err = tls_gen_selfsigned_cert(tls, aor); if (err) { - DEBUG_WARNING("failed to generate certificate (%s): %m\n", - aor, err); + warning("dtls: failed to generate certificate (%s): %m\n", + aor, err); goto out; } @@ -175,8 +170,8 @@ int dtls_alloc_selfsigned(struct tls **tlsp, const char *aor, } if (0 != SSL_CTX_set_tlsext_use_srtp(tls->ctx, srtp_profiles)) { - DEBUG_WARNING("could not enable SRTP for profiles '%s'\n", - srtp_profiles); + warning("dtls: could not enable SRTP for profiles '%s'\n", + srtp_profiles); err = ENOSYS; goto out; } diff --git a/modules/dtls_srtp/srtp.c b/modules/dtls_srtp/srtp.c index 7f33ccc..b68ebc1 100644 --- a/modules/dtls_srtp/srtp.c +++ b/modules/dtls_srtp/srtp.c @@ -13,11 +13,6 @@ #include "dtls_srtp.h" -#define DEBUG_MODULE "dtls_srtp" -#define DEBUG_LEVEL 5 -#include <re_dbg.h> - - struct srtp_stream { srtp_policy_t policy; srtp_t srtp; @@ -118,10 +113,10 @@ static bool send_handler(int *err, struct sa *dst, struct mbuf *mb, void *arg) } if (err_status_ok != e) { - DEBUG_WARNING("send: failed to protect %s-packet" - " with %d bytes (%H)\n", - is_rtcp_packet(mb) ? "RTCP" : "RTP", - len, errstatus_print, e); + warning("srtp: send: failed to protect %s-packet" + " with %d bytes (%H)\n", + is_rtcp_packet(mb) ? "RTCP" : "RTP", + len, errstatus_print, e); *err = EPROTO; return false; } @@ -152,10 +147,10 @@ static bool recv_handler(struct sa *src, struct mbuf *mb, void *arg) } if (e != err_status_ok) { - DEBUG_WARNING("recv: failed to unprotect %s-packet" - " with %d bytes (%H)\n", - is_rtcp_packet(mb) ? "RTCP" : "RTP", - len, errstatus_print, e); + warning("srtp: recv: failed to unprotect %s-packet" + " with %d bytes (%H)\n", + is_rtcp_packet(mb) ? "RTCP" : "RTP", + len, errstatus_print, e); return true; /* error - drop packet */ } @@ -195,7 +190,7 @@ int srtp_stream_add(struct srtp_stream **sp, const char *profile, crypto_policy_set_aes_cm_128_hmac_sha1_32(&s->policy.rtcp); } else { - DEBUG_WARNING("unsupported profile: %s\n", profile); + warning("srtp: unsupported profile: %s\n", profile); err = ENOSYS; goto out; } @@ -207,7 +202,7 @@ int srtp_stream_add(struct srtp_stream **sp, const char *profile, e = srtp_create(&s->srtp, &s->policy); if (err_status_ok != e) { s->srtp = NULL; - DEBUG_WARNING("srtp_create() failed. e=%d\n", e); + warning("srtp: srtp_create() failed. e=%d\n", e); err = ENOMEM; goto out; } diff --git a/modules/dtls_srtp/tls_udp.c b/modules/dtls_srtp/tls_udp.c index ada5310..058641a 100644 --- a/modules/dtls_srtp/tls_udp.c +++ b/modules/dtls_srtp/tls_udp.c @@ -8,14 +8,10 @@ #include <openssl/ssl.h> #include <openssl/err.h> #include <re.h> +#include <baresip.h> #include "dtls_srtp.h" -#define DEBUG_MODULE "tls_udp" -#define DEBUG_LEVEL 5 -#include <re_dbg.h> - - /* note: shadow struct in dtls.c */ struct tls { SSL_CTX *ctx; @@ -81,7 +77,7 @@ static int bio_write(BIO *b, const char *buf, int len) err = udp_send_helper(tc->us, &tc->peer, mb, tc->uh); if (err) { - DEBUG_WARNING("udp_send_helper: %m\n", err); + warning("dtls: udp_send_helper: %m\n", err); } mem_deref(mb); @@ -179,8 +175,8 @@ static int get_srtp_key_info(const struct dtls_flow *tc, char *name, size_t sz, keymatexportlen = (int)(kl + sl)*2; if (keymatexportlen != 60) { - DEBUG_WARNING("expected 60 bits, but keying material is %d\n", - keymatexportlen); + warning("dtls: expected 60 bits, but keying material is %d\n", + keymatexportlen); return EINVAL; } @@ -257,7 +253,7 @@ static bool recv_handler(struct sa *src, struct mbuf *mb, void *arg) err = get_srtp_key_info(flow, profile, sizeof(profile), &client_key, &server_key); if (err) { - DEBUG_WARNING("SRTP key info: %m\n", err); + warning("dtls: SRTP key info: %m\n", err); return true; } @@ -340,8 +336,8 @@ int dtls_flow_start(struct dtls_flow *flow, const struct sa *peer, bool active) ERR_clear_error(); if (ssl_err != SSL_ERROR_WANT_READ) { - DEBUG_WARNING("SSL_connect() failed" - " (err=%d)\n", ssl_err); + warning("dtls: SSL_connect() failed" + " (err=%d)\n", ssl_err); } } diff --git a/modules/natbd/natbd.c b/modules/natbd/natbd.c index 6711961..0aad61f 100644 --- a/modules/natbd/natbd.c +++ b/modules/natbd/natbd.c @@ -7,12 +7,9 @@ #include <baresip.h> -#define DEBUG_MODULE "natbd" -#define DEBUG_LEVEL 5 -#include <re_dbg.h> - - -/* +/** + * @defgroup natbd natbd + * * NAT Behavior Discovery Using STUN (RFC 5780) * * This module is only for diagnostics purposes and does not affect @@ -129,7 +126,7 @@ static void nat_mapping_handler(int err, enum nat_type type, void *arg) return; if (err) { - DEBUG_WARNING("NAT mapping failed (%m)\n", err); + warning("natbd: NAT mapping failed (%m)\n", err); goto out; } @@ -155,7 +152,7 @@ static void nat_filtering_handler(int err, enum nat_type type, void *arg) return; if (err) { - DEBUG_WARNING("NAT filtering failed (%m)\n", err); + warning("natbd: NAT filtering failed (%m)\n", err); goto out; } @@ -182,7 +179,7 @@ static void nat_lifetime_handler(int err, ++natbd->n_nl; if (err) { - DEBUG_WARNING("nat_lifetime_handler: (%m)\n", err); + warning("natbd: nat_lifetime_handler: (%m)\n", err); return; } @@ -206,12 +203,12 @@ static void nat_genalg_handler(int err, uint16_t scode, const char *reason, return; if (err) { - DEBUG_WARNING("Generic ALG detection failed: %m\n", err); + warning("natbd: Generic ALG detection failed: %m\n", err); goto out; } else if (scode) { - DEBUG_WARNING("Generic ALG detection failed: %u %s\n", - scode, reason); + warning("natbd: Generic ALG detection failed: %u %s\n", + scode, reason); goto out; } @@ -255,8 +252,8 @@ static int natbd_start(struct natbd *natbd) nat_hairpinning_handler, natbd); err |= nat_hairpinning_start(natbd->nh); if (err) { - DEBUG_WARNING("nat_hairpinning_start() failed (%m)\n", - err); + warning("natbd: nat_hairpinning_start() failed (%m)\n", + err); } } @@ -266,8 +263,8 @@ static int natbd_start(struct natbd *natbd) nat_mapping_handler, natbd); err |= nat_mapping_start(natbd->nm); if (err) { - DEBUG_WARNING("nat_mapping_start() failed (%m)\n", - err); + warning("natbd: nat_mapping_start() failed (%m)\n", + err); } } @@ -280,8 +277,8 @@ static int natbd_start(struct natbd *natbd) natbd); err |= nat_filtering_start(natbd->nf); if (err) { - DEBUG_WARNING("nat_filtering_start() (%m)\n", - err); + warning("natbd: nat_filtering_start() (%m)\n", + err); } } } @@ -292,12 +289,12 @@ static int natbd_start(struct natbd *natbd) nat_genalg_handler, natbd); if (err) { - DEBUG_WARNING("natbd_init: %m\n", err); + warning("natbd: natbd_init: %m\n", err); } err |= nat_genalg_start(natbd->ga); if (err) { - DEBUG_WARNING("nat_genalg_start() failed (%m)\n", - err); + warning("natbd: nat_genalg_start() failed (%m)\n", + err); } } @@ -322,8 +319,8 @@ static void dns_handler(int err, const struct sa *addr, void *arg) struct natbd *natbd = arg; if (err) { - DEBUG_WARNING("failed to resolve '%s' (%m)\n", - natbd->host, err); + warning("natbd: failed to resolve '%s' (%m)\n", + natbd->host, err); goto out; } @@ -341,8 +338,8 @@ static void dns_handler(int err, const struct sa *addr, void *arg) NULL, nat_lifetime_handler, natbd); err |= nat_lifetime_start(natbd->nl); if (err) { - DEBUG_WARNING("nat_lifetime_start() failed (%m)\n", - err); + warning("natbd: nat_lifetime_start() failed (%m)\n", + err); } } @@ -383,7 +380,7 @@ static void timeout_init(void *arg) out: if (err) { - DEBUG_WARNING("timeout_init: %m\n", err); + warning("natbd: timeout_init: %m\n", err); } } @@ -416,8 +413,8 @@ static int natbd_alloc(struct natbd **natbdp, uint32_t interval, natbd->port = pl_u32(&port); } else { - DEBUG_WARNING("failed to decode natbd_server (%s)\n", - server); + warning("natbd: failed to decode natbd_server (%s)\n", + server); err = EINVAL; goto out; } @@ -470,7 +467,7 @@ static int module_init(void) (void)conf_get_str(conf_cur(), "natbd_server", server, sizeof(server)); if (!server[0]) { - DEBUG_WARNING("missing config 'natbd_server'\n"); + warning("natbd: missing config 'natbd_server'\n"); return EINVAL; } @@ -480,7 +477,7 @@ static int module_init(void) err |= natbd_alloc(&natbdv[0], interval, IPPROTO_UDP, server); err |= natbd_alloc(&natbdv[1], interval, IPPROTO_TCP, server); if (err) { - DEBUG_WARNING("failed to allocate natbd state: %m\n", err); + warning("natbd: failed to allocate natbd state: %m\n", err); } return err; diff --git a/modules/srtp/srtp.c b/modules/srtp/srtp.c index bb86e96..8bda31a 100644 --- a/modules/srtp/srtp.c +++ b/modules/srtp/srtp.c @@ -12,11 +12,6 @@ #include "sdes.h" -#define DEBUG_MODULE "srtp" -#define DEBUG_LEVEL 5 -#include <re_dbg.h> - - struct menc_st { /* one SRTP session per media line */ uint8_t key_tx[32]; /* 32 for alignment, only 30 used */ @@ -137,7 +132,7 @@ static int start_srtp(struct menc_st *st, const char *suite) crypto_policy_set_aes_cm_128_hmac_sha1_80(&policy); } else { - DEBUG_WARNING("unknown SRTP crypto suite (%s)\n", suite); + warning("srtp: unknown SRTP crypto suite (%s)\n", suite); return ENOENT; } @@ -158,15 +153,15 @@ static int start_srtp(struct menc_st *st, const char *suite) /* allocate and initialize the SRTP session */ e = srtp_create(&st->srtp_tx, &st->policy_tx); if (e != err_status_ok) { - DEBUG_WARNING("srtp_create TX failed (%H)\n", - errstatus_print, e); + warning("srtp: srtp_create TX failed (%H)\n", + errstatus_print, e); return EPROTO; } e = srtp_create(&st->srtp_rx, &st->policy_rx); if (err_status_ok != e) { - DEBUG_WARNING("srtp_create RX failed (%H)\n", - errstatus_print, e); + warning("srtp: srtp_create RX failed (%H)\n", + errstatus_print, e); return EPROTO; } @@ -184,8 +179,8 @@ static int setup_srtp(struct menc_st *st) /* init SRTP */ e = crypto_get_random(st->key_tx, SRTP_MASTER_KEY_LEN); if (err_status_ok != e) { - DEBUG_WARNING("crypto_get_random() failed (%H)\n", - errstatus_print, e); + warning("srtp: crypto_get_random() failed (%H)\n", + errstatus_print, e); return ENOSYS; } @@ -217,10 +212,10 @@ static bool send_handler(int *err, struct sa *dst, struct mbuf *mb, void *arg) } if (err_status_ok != e) { - DEBUG_WARNING("send: failed to protect %s-packet" - " with %d bytes (%H)\n", - is_rtcp_packet(mb) ? "RTCP" : "RTP", - len, errstatus_print, e); + warning("srtp: send: failed to protect %s-packet" + " with %d bytes (%H)\n", + is_rtcp_packet(mb) ? "RTCP" : "RTP", + len, errstatus_print, e); *err = EPROTO; return false; } @@ -251,10 +246,10 @@ static bool recv_handler(struct sa *src, struct mbuf *mb, void *arg) } if (e != err_status_ok) { - DEBUG_WARNING("recv: failed to unprotect %s-packet" - " with %d bytes (%H)\n", - is_rtcp_packet(mb) ? "RTCP" : "RTP", - len, errstatus_print, e); + warning("srtp: recv: failed to unprotect %s-packet" + " with %d bytes (%H)\n", + is_rtcp_packet(mb) ? "RTCP" : "RTP", + len, errstatus_print, e); return true; /* error - drop packet */ } @@ -294,7 +289,7 @@ static int start_crypto(struct menc_st *st, const struct pl *key_info) return err; if (SRTP_MASTER_KEY_LEN != olen) { - DEBUG_WARNING("srtp keylen is %u (should be 30)\n", olen); + warning("srtp: srtp keylen is %u (should be 30)\n", olen); } err = start_srtp(st, st->crypto_suite); @@ -402,8 +397,8 @@ static int alloc(struct menc_media **stp, struct menc_sess *sess, rattr = sdp_media_rattr_apply(st->sdpm, "crypto", sdp_attr_handler, st); if (!rattr) { - DEBUG_WARNING("no valid a=crypto attribute from" - " remote peer\n"); + warning("srtp: no valid a=crypto attribute from" + " remote peer\n"); } } @@ -439,8 +434,8 @@ static int mod_srtp_init(void) err = srtp_init(); if (err_status_ok != err) { - DEBUG_WARNING("srtp_init() failed (%H)\n", - errstatus_print, err); + warning("srtp: srtp_init() failed (%H)\n", + errstatus_print, err); return ENOSYS; } |