diff options
author | Harald Welte <laforge@gnumonks.org> | 2017-05-28 19:43:21 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2017-05-28 19:44:26 +0200 |
commit | 0c655bce25d76b115f4c05f9d86c43475699f1a4 (patch) | |
tree | a8a68bc06450f74346a661d86d97926c1e5307ae /src/pq_rtp.c | |
parent | 7bdf34cc091ce558e27c260aaf37f2096fd92ca2 (diff) |
direct all log statements to stderr to avoid breaking stdout data out
The tool has the capability to be used in a pipe, so stdout should
recevie nothing else but actual codec/pcm data.
Diffstat (limited to 'src/pq_rtp.c')
-rw-r--r-- | src/pq_rtp.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/pq_rtp.c b/src/pq_rtp.c index d200770..f5603de 100644 --- a/src/pq_rtp.c +++ b/src/pq_rtp.c @@ -86,6 +86,7 @@ struct pq_state_rtp { uint32_t ssrc; }; +#define rtp_err(x, args...) fprintf(stderr, "[!] %s():" x, __func__, ## args) static int pq_cb_rtp_input(void *_state, uint8_t *out, const uint8_t *in, unsigned int in_len) @@ -99,30 +100,30 @@ pq_cb_rtp_input(void *_state, uint8_t *out, const uint8_t *in, unsigned int in_l rv = read(state->fd, buf, sizeof(buf)); if (rv <= 0) { - perror("RTP read"); + rtp_err("error during read\n"); return -1; } if (rv < sizeof(struct rtp_hdr)) { - fprintf(stderr, "%d smaller than rtp header\n", rv); + rtp_err("%d smaller than rtp header\n", rv); return -1; } if (rtph->version != RTP_VERSION) { - fprintf(stderr, "unknown RTP version %u\n", rtph->version); + rtp_err("unknown RTP version %u\n", rtph->version); return -1; } payload = buf + sizeof(struct rtp_hdr) + (rtph->csrc_count << 2); payload_len = rv - sizeof(struct rtp_hdr) - (rtph->csrc_count << 2); if (payload_len < 0) { - fprintf(stderr, "non-existant RTP payload length %d\n", payload_len); + rtp_err("non-existant RTP payload length %d\n", payload_len); return -1; } if (rtph->extension) { if (payload_len < sizeof(struct rtp_x_hdr)) { - fprintf(stderr, "short extension header: %d\n", payload_len); + rtp_err("short extension header: %d\n", payload_len); return -1; } rtpxh = (struct rtp_x_hdr *)payload; @@ -130,18 +131,18 @@ pq_cb_rtp_input(void *_state, uint8_t *out, const uint8_t *in, unsigned int in_l payload += x_len; payload_len -= x_len; if (payload_len < 0) { - fprintf(stderr, "short RTP payload length %d\n", payload_len); + rtp_err("short RTP payload length %d\n", payload_len); return -1; } } if (rtph->padding) { if (payload_len < 0) { - fprintf(stderr, "padding but no payload length %d\n", payload_len); + rtp_err("padding but no payload length %d\n", payload_len); return -1; } payload_len -= payload[payload_len -1]; if (payload_len < 0) { - fprintf(stderr, "no payload left after padding %d\n", payload_len); + rtp_err("no payload left after padding %d\n", payload_len); return -1; } } @@ -240,7 +241,7 @@ pq_queue_rtp_op(struct pq *pq, int udp_fd, unsigned int blk_len, int in_out_n) int pq_queue_rtp_input(struct pq *pq, int udp_fd, unsigned int blk_len) { - printf("PQ: Adding RTP input (blk_len=%u)\n", blk_len); + fprintf(stderr, "[+] PQ: Adding RTP input (blk_len=%u)\n", blk_len); return pq_queue_rtp_op(pq, udp_fd, blk_len, 1); } @@ -252,6 +253,6 @@ pq_queue_rtp_input(struct pq *pq, int udp_fd, unsigned int blk_len) int pq_queue_rtp_output(struct pq *pq, int udp_fd, unsigned int blk_len) { - printf("PQ: Adding RTP output (blk_len=%u)\n", blk_len); + fprintf(stderr, "[+] PQ: Adding RTP output (blk_len=%u)\n", blk_len); return pq_queue_rtp_op(pq, udp_fd, blk_len, 0); } |