use new logging functions

3 files changed, 53 insertions, 72 deletions

diff --git a/src/call.c b/src/call.c
index 03f0577..dc3edb5 100644
--- a/src/call.c
+++ b/src/call.c
@@ -12,19 +12,11 @@
 #include "core.h"
 
 
-#define DEBUG_MODULE "call"
-#define DEBUG_LEVEL 5
-#include <re_dbg.h>
-
 /** Magic number */
 #define MAGIC 0xca11ca11
 #include "magic.h"
 
 
-#ifndef RELEASE
-#define CALL_DEBUG       1  /**< Enable call debugging */
-#endif
-
 #define FOREACH_STREAM						\
 	for (le = call->streaml.head; le; le = le->next)
 
@@ -127,7 +119,7 @@ static void call_stream_start(struct call *call, bool active)
 				err = audio_start(call->audio);
 			}
 			if (err) {
-				DEBUG_WARNING("audio stream: %m\n", err);
+				warning("call: audio stream error: %m\n", err);
 			}
 		}
 		else {
@@ -150,7 +142,7 @@ static void call_stream_start(struct call *call, bool active)
 			err = video_start(call->video, call->peer_uri);
 		}
 		if (err) {
-			DEBUG_WARNING("video stream: %m\n", err);
+			warning("call: video stream error: %m\n", err);
 		}
 	}
 	else if (call->video) {
@@ -160,7 +152,7 @@ static void call_stream_start(struct call *call, bool active)
 	if (call->bfcp) {
 		err = bfcp_start(call->bfcp);
 		if (err) {
-			DEBUG_WARNING("bfcp_start() error: %m\n", err);
+			warning("call: could not start BFCP: %m\n", err);
 		}
 	}
 #endif
@@ -235,13 +227,13 @@ static void mnat_handler(int err, uint16_t scode, const char *reason,
 	MAGIC_CHECK(call);
 
 	if (err) {
-		DEBUG_WARNING("medianat '%s' failed: %m\n",
-			      call->acc->mnatid, err);
+		warning("call: medianat '%s' failed: %m\n",
+			call->acc->mnatid, err);
 		call_event_handler(call, CALL_EVENT_CLOSED, "%m", err);
 		return;
 	}
 	else if (scode) {
-		DEBUG_WARNING("medianat failed: %u %s\n", scode, reason);
+		warning("call: medianat failed: %u %s\n", scode, reason);
 		call_event_handler(call, CALL_EVENT_CLOSED, "%u %s",
 				   scode, reason);
 		return;
@@ -317,7 +309,7 @@ static int update_media(struct call *call)
 		err = video_encoder_set(call->video, sc->data,
 					sc->pt, sc->params);
 		if (err) {
-			DEBUG_WARNING("video stream: %m\n", err);
+			warning("call: video stream error: %m\n", err);
 		}
 	}
 	else if (call->video) {
@@ -388,7 +380,7 @@ static void audio_error_handler(int err, const char *str, void *arg)
 	MAGIC_CHECK(call);
 
 	if (err) {
-		DEBUG_WARNING("Audio error: %m (%s)\n", err, str);
+		warning("call: audio device error: %m (%s)\n", err, str);
 	}
 
 	call_stream_stop(call);
@@ -401,7 +393,7 @@ static void menc_error_handler(int err, void *arg)
 	struct call *call = arg;
 	MAGIC_CHECK(call);
 
-	DEBUG_WARNING("mediaenc error: %m\n", err);
+	warning("call: mediaenc '%s' error: %m\n", call->acc->mencid, err);
 
 	call_stream_stop(call);
 	call_event_handler(call, CALL_EVENT_CLOSED, "mediaenc failed");
@@ -484,7 +476,7 @@ int call_alloc(struct call **callp, const struct config *cfg, struct list *lst,
 				       call->sdp, !got_offer,
 				       mnat_handler, call);
 		if (err) {
-			DEBUG_WARNING("mnat session: %m\n", err);
+			warning("call: medianat session: %m\n", err);
 			goto out;
 		}
 	}
@@ -497,7 +489,7 @@ int call_alloc(struct call **callp, const struct config *cfg, struct list *lst,
 						!got_offer,
 						menc_error_handler, call);
 			if (err) {
-				DEBUG_WARNING("mediaenc session: %m\n", err);
+				warning("call: mediaenc session: %m\n", err);
 				goto out;
 			}
 		}
@@ -966,7 +958,7 @@ static int sipsess_answer_handler(const struct sip_msg *msg, void *arg)
 
 	err = sdp_decode(call->sdp, msg->mb, false);
 	if (err) {
-		DEBUG_WARNING("answer: sdp_decode: %m\n", err);
+		warning("call: could not decode SDP answer: %m\n", err);
 		return err;
 	}
 
@@ -1108,7 +1100,7 @@ static void sipsess_refer_handler(struct sip *sip, const struct sip_msg *msg,
 	/* get the transfer target */
 	hdr = sip_msg_hdr(msg, SIP_HDR_REFER_TO);
 	if (!hdr) {
-		DEBUG_WARNING("bad REFER request from %r\n", &msg->from.auri);
+		warning("call: bad REFER request from %r\n", &msg->from.auri);
 		(void)sip_reply(sip, msg, 400, "Missing Refer-To header");
 		return;
 	}
@@ -1125,7 +1117,7 @@ static void sipsess_refer_handler(struct sip *sip, const struct sip_msg *msg,
 			      sipnot_close_handler, call,
 	                      "Allow: %s\r\n", uag_allowed_methods());
 	if (err) {
-		DEBUG_WARNING("refer: sipevent_accept failed: %m\n", err);
+		warning("call: refer: sipevent_accept failed: %m\n", err);
 		return;
 	}
 
@@ -1212,7 +1204,7 @@ int call_accept(struct call *call, struct sipsess_sock *sess_sock,
 			     sipsess_refer_handler, sipsess_close_handler,
 			     call, "Allow: %s\r\n", uag_allowed_methods());
 	if (err) {
-		DEBUG_WARNING("sipsess_accept: %m\n", err);
+		warning("call: sipsess_accept: %m\n", err);
 		return err;
 	}
 
@@ -1312,7 +1304,7 @@ static int send_invite(struct call *call)
 			      "Allow: %s\r\n%H", uag_allowed_methods(),
 			      ua_print_supported, call->ua);
 	if (err) {
-		DEBUG_WARNING("sipsess_connect: %m\n", err);
+		warning("call: sipsess_connect: %m\n", err);
 	}
 
 	mem_deref(desc);
@@ -1447,7 +1439,7 @@ static void sipsub_notify_handler(struct sip *sip, const struct sip_msg *msg,
 	sc = pl_u32(&scode);
 
 	if (sc >= 300) {
-		DEBUG_WARNING("call transfer failed: %u %r\n", sc, &reason);
+		warning("call: transfer failed: %u %r\n", sc, &reason);
 	}
 	else if (sc >= 200) {
 		call_event_handler(call, CALL_EVENT_CLOSED, "Call transfered");
@@ -1534,7 +1526,7 @@ int call_transfer(struct call *call, const char *uri)
 			      call,
 			      "Refer-To: %s\r\n", nuri);
 	if (err) {
-		DEBUG_WARNING("sipevent_drefer: %m\n", err);
+		warning("call: sipevent_drefer: %m\n", err);
 	}
 
 	mem_deref(nuri);
diff --git a/src/ua.c b/src/ua.c
index 713890c..cb99011 100644
--- a/src/ua.c
+++ b/src/ua.c
@@ -9,10 +9,6 @@
 #include "core.h"
 
 
-#define DEBUG_MODULE "ua"
-#define DEBUG_LEVEL 5
-#include <re_dbg.h>
-
 /** Magic number */
 #define MAGIC 0x0a0a0a0a
 #include "magic.h"
@@ -186,7 +182,7 @@ int ua_register(struct ua *ua)
 		err = reg_register(reg, reg_uri, params,
 				   acc->regint, acc->outbound[i]);
 		if (err) {
-			DEBUG_WARNING("SIP register failed: %m\n", err);
+			warning("ua: SIP register failed: %m\n", err);
 			return err;
 		}
 	}
@@ -318,8 +314,8 @@ static void call_event_handler(struct call *call, enum call_event ev,
 
 			err = call_connect(call2, &pl);
 			if (err) {
-				DEBUG_WARNING("transfer: connect error: %m\n",
-					      err);
+				warning("ua: transfer: connect error: %m\n",
+					err);
 			}
 		}
 
@@ -339,7 +335,7 @@ static int ua_call_alloc(struct call **callp, struct ua *ua,
 	struct call_prm cprm;
 
 	if (*callp) {
-		DEBUG_WARNING("call_alloc: call is already allocated\n");
+		warning("ua: call_alloc: call is already allocated\n");
 		return EALREADY;
 	}
 
@@ -382,7 +378,7 @@ static void handle_options(struct ua *ua, const struct sip_msg *msg)
 			  mbuf_buf(desc),
 			  mbuf_get_left(desc));
 	if (err) {
-		DEBUG_WARNING("options: sip_treplyf: %m\n", err);
+		warning("ua: options: sip_treplyf: %m\n", err);
 	}
 
  out:
@@ -438,7 +434,7 @@ static void add_extension(struct ua *ua, const char *extension)
 	struct pl e;
 
 	if (ua->extensionc >= ARRAY_SIZE(ua->extensionv)) {
-		DEBUG_WARNING("maximum %u number of SIP extensions\n");
+		warning("ua: maximum %u number of SIP extensions\n");
 		return;
 	}
 
@@ -517,7 +513,7 @@ int ua_alloc(struct ua **uap, const char *aor)
 
 		if (!str_isset(uag.cfg->uuid)) {
 
-			DEBUG_WARNING("outbound requires valid UUID!\n");
+			warning("ua: outbound requires valid UUID!\n");
 			err = ENOSYS;
 			goto out;
 		}
@@ -754,7 +750,7 @@ int ua_options_send(struct ua *ua, const char *uri,
 			   "Content-Length: 0\r\n"
 			   "\r\n");
 	if (err) {
-		DEBUG_WARNING("send options: (%m)\n", err);
+		warning("ua: send options: (%m)\n", err);
 	}
 
 	return err;
@@ -857,8 +853,8 @@ static int add_transp_af(const struct sa *laddr)
 		if (err) {
 			err = sa_set_str(&local, uag.cfg->local, 0);
 			if (err) {
-				DEBUG_WARNING("decode failed: %s\n",
-					      uag.cfg->local);
+				warning("ua: decode failed: '%s'\n",
+					uag.cfg->local);
 				return err;
 			}
 		}
@@ -882,7 +878,7 @@ static int add_transp_af(const struct sa *laddr)
 	if (uag.use_tcp)
 		err |= sip_transp_add(uag.sip, SIP_TRANSP_TCP, &local);
 	if (err) {
-		DEBUG_WARNING("SIP Transport failed: %m\n", err);
+		warning("ua: SIP Transport failed: %m\n", err);
 		return err;
 	}
 
@@ -900,7 +896,7 @@ static int add_transp_af(const struct sa *laddr)
 			err = tls_alloc(&uag.tls, TLS_METHOD_SSLV23,
 					cert, NULL);
 			if (err) {
-				DEBUG_WARNING("tls_alloc() failed: %m\n", err);
+				warning("ua: tls_alloc() failed: %m\n", err);
 				return err;
 			}
 		}
@@ -910,7 +906,7 @@ static int add_transp_af(const struct sa *laddr)
 
 		err = sip_transp_add(uag.sip, SIP_TRANSP_TLS, &local, uag.tls);
 		if (err) {
-			DEBUG_WARNING("SIP/TLS transport failed: %m\n", err);
+			warning("ua: SIP/TLS transport failed: %m\n", err);
 			return err;
 		}
 	}
@@ -971,8 +967,8 @@ static void sipsess_conn_handler(const struct sip_msg *msg, void *arg)
 
 	ua = uag_find(&msg->uri.user);
 	if (!ua) {
-		DEBUG_WARNING("%r: UA not found: %r\n",
-			      &msg->from.auri, &msg->uri.user);
+		warning("ua: %r: UA not found: %r\n",
+			&msg->from.auri, &msg->uri.user);
 		(void)sip_treply(NULL, uag_sip(), msg, 404, "Not Found");
 		return;
 	}
@@ -1005,7 +1001,7 @@ static void sipsess_conn_handler(const struct sip_msg *msg, void *arg)
 
 	err = ua_call_alloc(&call, ua, VIDMODE_ON, msg, NULL, to_uri);
 	if (err) {
-		DEBUG_WARNING("call_alloc: %m\n", err);
+		warning("ua: call_alloc: %m\n", err);
 		goto error;
 	}
 
@@ -1078,7 +1074,7 @@ int ua_init(const char *software, bool udp, bool tcp, bool tls,
 	/* Initialise Network */
 	err = net_init(&cfg->net, prefer_ipv6 ? AF_INET6 : AF_INET);
 	if (err) {
-		DEBUG_WARNING("network init failed: %m\n", err);
+		warning("ua: network init failed: %m\n", err);
 		return err;
 	}
 
@@ -1092,7 +1088,7 @@ int ua_init(const char *software, bool udp, bool tcp, bool tls,
 	err = sip_alloc(&uag.sip, net_dnsc(), bsize, bsize, bsize,
 			software, exit_handler, NULL);
 	if (err) {
-		DEBUG_WARNING("sip stack failed: %m\n", err);
+		warning("ua: sip stack failed: %m\n", err);
 		goto out;
 	}
 
@@ -1121,7 +1117,7 @@ int ua_init(const char *software, bool udp, bool tcp, bool tls,
 
  out:
 	if (err) {
-		DEBUG_WARNING("init failed (%m)\n", err);
+		warning("ua: init failed (%m)\n", err);
 		ua_close();
 	}
 	return err;
diff --git a/src/video.c b/src/video.c
index f7eb032..34ea04a 100644
--- a/src/video.c
+++ b/src/video.c
@@ -13,11 +13,6 @@
 #include "core.h"
 
 
-#define DEBUG_MODULE "video"
-#define DEBUG_LEVEL 5
-#include <re_dbg.h>
-
-
 /** Magic number */
 #define MAGIC 0x00070d10
 #include "magic.h"
@@ -261,10 +256,8 @@ static void encode_rtp_send(struct vtx *vtx, struct vidframe *frame)
 
 	/* Encode the whole picture frame */
 	err = vtx->vc->ench(vtx->enc, vtx->picup, frame, packet_handler, vtx);
-	if (err) {
-		DEBUG_WARNING("encode: %m\n", err);
+	if (err)
 		return;
-	}
 
 	vtx->ts_tx += (SRATE/vtx->vsrc_prm.fps);
 	vtx->picup = false;
@@ -302,7 +295,7 @@ static void vidsrc_error_handler(int err, void *arg)
 {
 	struct vtx *vtx = arg;
 
-	DEBUG_WARNING("Video-source error: %m\n", err);
+	warning("video: video-source error: %m\n", err);
 
 	vtx->vsrc = mem_deref(vtx->vsrc);
 }
@@ -373,7 +366,7 @@ static int video_stream_decode(struct vrx *vrx, const struct rtp_header *hdr,
 
 	/* No decoder set */
 	if (!vrx->dec) {
-		DEBUG_WARNING("No video decoder!\n");
+		warning("video: No video decoder!\n");
 		goto out;
 	}
 
@@ -382,10 +375,10 @@ static int video_stream_decode(struct vrx *vrx, const struct rtp_header *hdr,
 	if (err) {
 
 		if (err != EPROTO) {
-			DEBUG_WARNING("%s decode error"
-				      " (seq=%u, %u bytes): %m\n",
-				      vrx->vc->name, hdr->seq,
-				      mbuf_get_left(mb), err);
+			warning("video: %s decode error"
+				" (seq=%u, %u bytes): %m\n",
+				vrx->vc->name, hdr->seq,
+				mbuf_get_left(mb), err);
 		}
 
 		/* send RTCP FIR to peer */
@@ -615,8 +608,8 @@ int video_alloc(struct video **vp, const struct config *cfg,
 		err |= vidfilt_enc_append(&v->vtx.filtl, &ctx, vf);
 		err |= vidfilt_dec_append(&v->vrx.filtl, &ctx, vf);
 		if (err) {
-			DEBUG_WARNING("video-filter '%s' failed (%m)\n",
-				      vf->name, err);
+			warning("video: video-filter '%s' failed (%m)\n",
+				vf->name, err);
 			break;
 		}
 	}
@@ -729,8 +722,8 @@ int video_start(struct video *v, const char *peer)
 
 	err = set_vidisp(&v->vrx);
 	if (err) {
-		DEBUG_WARNING("could not set vidisp '%s': %m\n",
-			      v->vrx.device, err);
+		warning("video: could not set vidisp '%s': %m\n",
+			v->vrx.device, err);
 	}
 
 	size.w = v->cfg.width;
@@ -738,9 +731,9 @@ int video_start(struct video *v, const char *peer)
 	err = set_encoder_format(&v->vtx, v->cfg.src_mod,
 				 v->vtx.device, &size);
 	if (err) {
-		DEBUG_WARNING("could not set encoder format to"
-			      " [%u x %u] %m\n",
-			      size.w, size.h, err);
+		warning("video: could not set encoder format to"
+			" [%u x %u] %m\n",
+			size.w, size.h, err);
 	}
 
 	tmr_start(&v->tmr, TMR_INTERVAL * 1000, tmr_handler, v);
@@ -874,7 +867,7 @@ int video_encoder_set(struct video *v, struct vidcodec *vc,
 		vtx->enc = mem_deref(vtx->enc);
 		err = vc->encupdh(&vtx->enc, vc, &prm, params);
 		if (err) {
-			DEBUG_WARNING("encoder alloc: %m\n", err);
+			warning("video: encoder alloc: %m\n", err);
 			return err;
 		}
 
@@ -908,7 +901,7 @@ int video_decoder_set(struct video *v, struct vidcodec *vc, int pt_rx,
 
 		err = vc->decupdh(&vrx->dec, vc, fmtp);
 		if (err) {
-			DEBUG_WARNING("decoder alloc: %m\n", err);
+			warning("video: decoder alloc: %m\n", err);
 			return err;
 		}