X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ortp_send.c;h=deb7d94763dfe53b6a58963bd0360175eda171de;hp=9d244225d39f557fc1a7132b0173e2d8b0269c16;hb=67cccf4883d30aded54d5d6d748479d800bad3ef;hpb=8b2c02c8d6255583982e767374d39375b3380c4d diff --git a/ortp_send.c b/ortp_send.c index 9d244225..deb7d947 100644 --- a/ortp_send.c +++ b/ortp_send.c @@ -32,8 +32,6 @@ #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 */ @@ -80,7 +78,7 @@ 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; - 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"); @@ -89,6 +87,20 @@ static void ortp_send_buf(char *buf, int len, long unsigned chunks_sent) } } +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; @@ -110,13 +122,15 @@ static void ortp_init_session(struct ortp_target *ot) if (ret < 0) { rtp_session_destroy(ot->session); ot->session = NULL; + return; } + set_multicast(s); } /* called by afs */ 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);