/*
- * 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
#include "server.cmdline.h"
#include "server.h"
-#include "afs.h"
+#include "vss.h"
#include "send.h"
#include "list.h"
#include "ortp.h"
#define TARGET_ADDR(oc) inet_ntoa((oc)->addr)
/** \endcond */
-extern struct gengetopt_args_info conf;
-
/** describes one entry in the list of targets for the ortp sender */
struct ortp_target {
/** address info */
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");
- if (ret != len +12)
+ if (ret != len + 12)
PARA_NOTICE_LOG("short write %d\n", ret);
}
}
+static int set_multicast(RtpSession *s)
+{
+ unsigned char loop = 1;
+ int ret;
+
+ ret = setsockopt(s->rtp.socket,
+ IPPROTO_IP, IP_MULTICAST_LOOP, &loop, sizeof(loop));
+ if (ret < 0) {
+ PARA_ERROR_LOG("IP_MULTICAST_LOOP error %d\n", ret);
+
+ }
+ return 1;
+}
+
static void ortp_init_session(struct ortp_target *ot)
{
RtpSession *s;
if (ret < 0) {
rtp_session_destroy(ot->session);
ot->session = NULL;
+ return;
}
+ set_multicast(s);
}
-/* called by afs */
+/* called by vss */
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);
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 (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;
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)