Make pass_afd() static.

[paraslash.git] / ortp_send.c

diff --git a/ortp_send.c b/ortp_send.c
index 65c68418bc7cba6f9d6f327d6b95195dfb2f8c74..084fdf5753aaaaa610b9209235bccae803dd3052 100644 (file)
--- a/ortp_send.c
+++ b/ortp_send.c
@@ -1,19 +1,7 @@
 /*
  * 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 */
@@ -22,12 +10,16 @@
 #include <ortp/port.h>
 
 #include "server.cmdline.h"
+#include "para.h"
+#include "error.h"
+#include "string.h"
+#include "afh.h"
+#include "afs.h"
 #include "server.h"
 #include "vss.h"
 #include "send.h"
 #include "list.h"
 #include "ortp.h"
-#include "string.h"
 
 /** \cond convert in_addr to ascii */
 #define TARGET_ADDR(oc) inet_ntoa((oc)->addr)
@@ -171,13 +163,15 @@ static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent,
 {
        struct ortp_target *ot, *tmp;
        size_t sendbuf_len;
-       size_t header_len = 0;
+       unsigned header_len = 0;
        int packet_type = ORTP_DATA;
        char *sendbuf, *header_buf = NULL;
        struct timeval *chunk_tv;
 
        if (self->status != SENDER_ON)
                return;
+
+//     PARA_NOTICE_LOG("sending %lu\n", current_chunk);
        chunk_tv = vss_chunk_time();
        if (!chunk_tv)
                return;
@@ -299,7 +293,7 @@ static void ortp_init_target_list(void)
                if (!p)
                        goto err;
                *p = '\0';
-               if (!inet_aton(arg, &addr))
+               if (!inet_pton(AF_INET, arg, &addr))
                        goto err;
                port = atoi(++p);
                if (port < 0 || port > 65535)