crypt.c: fix memory leak in para_decrypt_buffer()

[paraslash.git] / ortp_send.c

diff --git a/ortp_send.c b/ortp_send.c
index 4dd19d7d2cb183743ff0dee435692c44eff43e16..b06a1b84f80f4d9daa88b635d48790f9a1bf8aa3 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


@@ -22,7 +22,7 @@
 
 #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"


@@ -128,7 +128,7 @@ static void ortp_init_session(struct ortp_target *ot)
        set_multicast(s);
 }
 
        set_multicast(s);
 }
 

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

 static void ortp_shutdown_targets(void)
 {
        unsigned char buf[ORTP_AUDIO_HEADER_LEN];
 static void ortp_shutdown_targets(void)
 {
        unsigned char buf[ORTP_AUDIO_HEADER_LEN];


@@ -175,7 +175,7 @@ static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent,
 
        if (self->status != SENDER_ON)
                return;
 
        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) {


@@ -193,7 +193,7 @@ static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent,
        }
        if (list_empty(&targets))
                return;
        }
        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;