projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 b084bb68ac4b89b3a3921c5d002d00444ba14cb3..b06a1b84f80f4d9daa88b635d48790f9a1bf8aa3 100644
(file)
--- a/
ortp_send.c
+++ b/
ortp_send.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2005-200
6
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-200
7
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 "
af
s.h"
+#include "
vs
s.h"
#include "send.h"
#include "list.h"
#include "ortp.h"
#include "send.h"
#include "list.h"
#include "ortp.h"
@@
-78,11
+78,12
@@
static void ortp_send_buf(char *buf, int len, long unsigned chunks_sent)
continue;
WRITE_CHUNK_TS(buf, ot->chunk_ts);
ts = ot->chunk_ts * chunks_sent;
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, 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);
}
}
@@
-127,10
+128,10
@@
static void ortp_init_session(struct ortp_target *ot)
set_multicast(s);
}
set_multicast(s);
}
-/* called by
af
s */
+/* called by
vs
s */
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);
@@
-174,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 =
af
s_chunk_time();
+ chunk_tv =
vs
s_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) {
@@
-192,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 =
af
s_get_header(&header_len);
+ header_buf =
vs
s_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;
@@
-248,7
+249,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)