fix handling of corrupt mp3 files

[paraslash.git] / ortp_send.c

diff --git a/ortp_send.c b/ortp_send.c
index dd4ee88409c3155853150c62736c6fa40ee4573c..15b97eb1304caaf2ec1198acde6252dd1bc10ee3 100644 (file)
--- a/ortp_send.c
+++ b/ortp_send.c
@@ -78,15 +78,30 @@ static void ortp_send_buf(char *buf, int len, long unsigned chunks_sent)
                        continue;
                WRITE_CHUNK_TS(buf, ot->chunk_ts);
                ts = ot->chunk_ts * chunks_sent;
-               ret = rtp_session_send_with_ts(ot->session, buf, len, ts);
+               ret = rtp_session_send_with_ts(ot->session,
+                       (unsigned char*)buf, len, ts);
                ot->last_ts = ts;
                if (ret < 0)
                        ortp_delete_target(ot, "send error");
-               if (ret != len +12)
+               if (ret != len + 12)
                        PARA_NOTICE_LOG("short write %d\n", ret);
        }
 }
 
+static int set_multicast(RtpSession *s)
+{
+       unsigned char loop = 1;
+       int ret;
+
+       ret = setsockopt(s->rtp.socket,
+               IPPROTO_IP, IP_MULTICAST_LOOP, &loop, sizeof(loop));
+       if (ret < 0) {
+               PARA_ERROR_LOG("IP_MULTICAST_LOOP error %d\n", ret);
+
+       }
+       return 1;
+}
+
 static void ortp_init_session(struct ortp_target *ot)
 {
        RtpSession *s;
@@ -108,13 +123,15 @@ static void ortp_init_session(struct ortp_target *ot)
        if (ret < 0) {
                rtp_session_destroy(ot->session);
                ot->session = NULL;
+               return;
        }
+       set_multicast(s);
 }
 
 /* called by afs */
 static void ortp_shutdown_targets(void)
 {
-       char buf[ORTP_AUDIO_HEADER_LEN];
+       unsigned char buf[ORTP_AUDIO_HEADER_LEN];
        struct ortp_target *ot, *tmp;
 
        WRITE_PACKET_TYPE(buf, ORTP_EOF);