net.c: Improve documentation of struct crypt_data.

[paraslash.git] / ortp_send.c

diff --git a/ortp_send.c b/ortp_send.c
index b06a1b84f80f4d9daa88b635d48790f9a1bf8aa3..18b5edd345fe66c048ee1dc0f2eaa4911e617fbe 100644 (file)
--- a/ortp_send.c
+++ b/ortp_send.c
@@ -1,24 +1,13 @@
 /*
  * 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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file ortp_send.c para_server's ortp sender */
 
 #include <ortp/ortp.h>
+#include <ortp/port.h>
 
 #include "server.cmdline.h"
 #include "server.h"
@@ -39,9 +28,9 @@ struct ortp_target {
 /** 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 */
-       int last_ts;
+       uint32_t last_ts;
 /** the position of this target in the list of targets */
        struct list_head node;
 /** the UDP port */
@@ -67,19 +56,21 @@ static void ortp_delete_target(struct ortp_target *ot, const char *msg)
        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;
-       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) {
-               int ts;
+               uint32_t ts;
                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,
-                       (unsigned char*)buf, len, ts);
+                       (unsigned char*)buf, ortp_len, ts);
                ot->last_ts = ts;
                if (ret < 0)
                        ortp_delete_target(ot, "send error");
@@ -168,7 +159,7 @@ static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent,
 {
        struct ortp_target *ot, *tmp;
        size_t sendbuf_len;
-       int header_len = 0;
+       unsigned header_len = 0;
        int packet_type = ORTP_DATA;
        char *sendbuf, *header_buf = NULL;
        struct timeval *chunk_tv;
@@ -186,7 +177,7 @@ 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,
-                               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;