Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash

[paraslash.git] / ortp_send.c

diff --git a/ortp_send.c b/ortp_send.c
index dd4ee88409c3155853150c62736c6fa40ee4573c..65c68418bc7cba6f9d6f327d6b95195dfb2f8c74 100644 (file)
--- a/ortp_send.c
+++ b/ortp_send.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>

  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by


@@ -19,10 +19,11 @@
 /** \file ortp_send.c para_server's ortp sender */
 
 #include <ortp/ortp.h>
 /** \file ortp_send.c para_server's ortp sender */
 
 #include <ortp/ortp.h>

+#include <ortp/port.h>

 
 #include "server.cmdline.h"
 #include "server.h"
 
 #include "server.cmdline.h"
 #include "server.h"

-#include "afs.h"
+#include "vss.h"

 #include "send.h"
 #include "list.h"
 #include "ortp.h"
 #include "send.h"
 #include "list.h"
 #include "ortp.h"


@@ -39,9 +40,9 @@ struct ortp_target {
 /** whether the ortp sender is activated */
        int status;
 /** the ortp timestamp increases by this amount */
 /** whether the ortp sender is activated */
        int status;
 /** the ortp timestamp increases by this amount */

-       int chunk_ts;
+       uint32_t chunk_ts;

 /** the currently used timestamp for this target */
 /** the currently used timestamp for this target */

-       int last_ts;
+       uint32_t last_ts;

 /** the position of this target in the list of targets */
        struct list_head node;
 /** the UDP port */
 /** the position of this target in the list of targets */
        struct list_head node;
 /** the UDP port */


@@ -67,26 +68,43 @@ static void ortp_delete_target(struct ortp_target *ot, const char *msg)
        free(ot);
 }
 
        free(ot);
 }
 

-static void ortp_send_buf(char *buf, int len, long unsigned chunks_sent)
+static void ortp_send_buf(char *buf, size_t len, long unsigned chunks_sent)

 {
        struct ortp_target *ot, *tmp;
 {
        struct ortp_target *ot, *tmp;

-       int ret;
+       int ret, ortp_len = len; /* rtp_session_send_with_ts expects int */

 
 

+       if (ortp_len < 0)
+               return;

        list_for_each_entry_safe(ot, tmp, &targets, node) {
        list_for_each_entry_safe(ot, tmp, &targets, node) {

-               int ts;
+               uint32_t ts;

                if (!ot->session)
                        continue;
                WRITE_CHUNK_TS(buf, ot->chunk_ts);
                ts = ot->chunk_ts * chunks_sent;
                if (!ot->session)
                        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, ortp_len, ts);

                ot->last_ts = ts;
                if (ret < 0)
                        ortp_delete_target(ot, "send error");
                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);
        }
 }
 
                        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;
 static void ortp_init_session(struct ortp_target *ot)
 {
        RtpSession *s;


@@ -108,13 +126,15 @@ static void ortp_init_session(struct ortp_target *ot)
        if (ret < 0) {
                rtp_session_destroy(ot->session);
                ot->session = NULL;
        if (ret < 0) {
                rtp_session_destroy(ot->session);
                ot->session = NULL;

+               return;

        }
        }

+       set_multicast(s);

 }
 
 }
 

-/* called by afs */
+/* called by vss */

 static void ortp_shutdown_targets(void)
 {
 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);
        struct ortp_target *ot, *tmp;
 
        WRITE_PACKET_TYPE(buf, ORTP_EOF);


@@ -151,14 +171,14 @@ static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent,
 {
        struct ortp_target *ot, *tmp;
        size_t sendbuf_len;
 {
        struct ortp_target *ot, *tmp;
        size_t sendbuf_len;

-       int header_len = 0;
+       size_t header_len = 0;

        int packet_type = ORTP_DATA;
        char *sendbuf, *header_buf = NULL;
        struct timeval *chunk_tv;
 
        if (self->status != SENDER_ON)
                return;
        int packet_type = ORTP_DATA;
        char *sendbuf, *header_buf = NULL;
        struct timeval *chunk_tv;
 
        if (self->status != SENDER_ON)
                return;

-       chunk_tv = afs_chunk_time();
+       chunk_tv = vss_chunk_time();

        if (!chunk_tv)
                return;
        list_for_each_entry_safe(ot, tmp, &targets, node) {
        if (!chunk_tv)
                return;
        list_for_each_entry_safe(ot, tmp, &targets, node) {


@@ -169,14 +189,14 @@ static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent,
                }
                if (!ot->chunk_ts)
                        ot->chunk_ts = rtp_session_time_to_ts(ot->session,
                }
                if (!ot->chunk_ts)
                        ot->chunk_ts = rtp_session_time_to_ts(ot->session,

-                               tv2ms(chunk_tv));
+                               (int)tv2ms(chunk_tv));

 //             PARA_DEBUG_LOG("len: %d, ts: %lu, ts: %d\n",
 //                     len, ot->chunk_ts * chunks_sent, ot->chunk_ts);
                ot->streaming = 1;
        }
        if (list_empty(&targets))
                return;
 //             PARA_DEBUG_LOG("len: %d, ts: %lu, ts: %d\n",
 //                     len, ot->chunk_ts * chunks_sent, ot->chunk_ts);
                ot->streaming = 1;
        }
        if (list_empty(&targets))
                return;

-       header_buf = afs_get_header(&header_len);
+       header_buf = vss_get_header(&header_len);

        if (!need_extra_header(current_chunk))
                header_len = 0;
        sendbuf_len = ORTP_AUDIO_HEADER_LEN + header_len + len;
        if (!need_extra_header(current_chunk))
                header_len = 0;
        sendbuf_len = ORTP_AUDIO_HEADER_LEN + header_len + len;


@@ -232,7 +252,7 @@ static void ortp_add_target(int port, struct in_addr *addr)
        ot->addr = *addr;
        PARA_INFO_LOG("adding to target list (%s:%d)\n",
                TARGET_ADDR(ot), ot->port);
        ot->addr = *addr;
        PARA_INFO_LOG("adding to target list (%s:%d)\n",
                TARGET_ADDR(ot), ot->port);

-       list_add(&ot->node, &targets);
+       para_list_add(&ot->node, &targets);

 }
 
 static int ortp_com_add(struct sender_command_data *scd)
 }
 
 static int ortp_com_add(struct sender_command_data *scd)