Browse Source

netjack-to-compile fixes for OS X

git-svn-id: svn+ssh://jackaudio.org/trunk/jack@3184 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/0.116.0^0
paul 17 years ago
parent
commit
dc837ebbd6
2 changed files with 10 additions and 3 deletions
  1. +8
    -1
      drivers/netjack/net_driver.c
  2. +2
    -2
      drivers/netjack/netjack_packet.c

+ 8
- 1
drivers/netjack/net_driver.c View File

@@ -469,12 +469,19 @@ net_driver_write (net_driver_t* driver, jack_nframes_t nframes)
if (driver->srcaddress_valid)
{
int r;

#ifdef __APPLE__
static const int flag = 0;
#else
static const int flag = MSG_CONFIRM;
#endif

if (driver->reply_port)
driver->syncsource_address.sin_port = htons(driver->reply_port);

for( r=0; r<driver->redundancy; r++ )
netjack_sendto(driver->outsockfd, (char *)packet_buf, packet_size,
MSG_CONFIRM, (struct sockaddr*)&(driver->syncsource_address), sizeof(struct sockaddr_in), driver->mtu);
flag, (struct sockaddr*)&(driver->syncsource_address), sizeof(struct sockaddr_in), driver->mtu);
}

return 0;


+ 2
- 2
drivers/netjack/netjack_packet.c View File

@@ -476,7 +476,7 @@ packet_cache_drain_socket( packet_cache *pcache, int sockfd )
while (1)
{
rcv_len = recvfrom (sockfd, rx_packet, pcache->mtu, MSG_DONTWAIT,
&sender_address, &senderlen);
(struct sockaddr*) &sender_address, &senderlen);
if (rcv_len < 0)
return;

@@ -763,7 +763,7 @@ netjack_sendto (int sockfd, char *packet_buf, int pkt_size, int flags, struct so
//jack_error("last fragment_count = %d, payload_size = %d\n", fragment_count, last_payload_size);

// sendto(last_pack_size);
sendto(sockfd, tx_packet, last_payload_size + sizeof(jacknet_packet_header), flags, addr, addr_size);
err = sendto(sockfd, tx_packet, last_payload_size + sizeof(jacknet_packet_header), flags, addr, addr_size);
if( err<0 ) {
printf( "error in send\n" );
perror( "send" );


Loading…
Cancel
Save