X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ortp_send.c;h=0c6cccb902a7be84f0f4ce1d40c699c7ff544cda;hp=18b5edd345fe66c048ee1dc0f2eaa4911e617fbe;hb=d0381117c7bce410b626bc159ab7763fdb022397;hpb=39e304a0adbeee8d606f3c003a338c93f48dd16b diff --git a/ortp_send.c b/ortp_send.c index 18b5edd3..0c6cccb9 100644 --- a/ortp_send.c +++ b/ortp_send.c @@ -10,34 +10,37 @@ #include #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 */ +/** Convert in_addr to ascii. */ #define TARGET_ADDR(oc) inet_ntoa((oc)->addr) -/** \endcond */ -/** describes one entry in the list of targets for the ortp sender */ +/** Describes one entry in the list of targets for the ortp sender. */ struct ortp_target { -/** address info */ + /** Address info. */ struct in_addr addr; -/** whether the ortp sender is activated */ + /** Whether the ortp sender is activated. */ int status; -/** the ortp timestamp increases by this amount */ + /** The ortp timestamp increases by this amount. */ uint32_t chunk_ts; -/** the currently used timestamp for this target */ + /** The currently used timestamp for this target. */ uint32_t last_ts; -/** the position of this target in the list of targets */ + /** The position of this target in the list of targets. */ struct list_head node; -/** the UDP port */ + /** The UDP port. */ int port; -/** non-zero if at least one chunk has been sent to this target */ + /** Non-zero if at least one chunk has been sent to this target. */ int streaming; -/** the session pointer from libortp */ + /** The session pointer from libortp. */ RtpSession *session; }; @@ -166,6 +169,8 @@ static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent, if (self->status != SENDER_ON) return; + +// PARA_NOTICE_LOG("sending %lu\n", current_chunk); chunk_tv = vss_chunk_time(); if (!chunk_tv) return; @@ -287,7 +292,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)