~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Playlist event log support for server and eclient.
[disorder]
/
server
/
speaker-network.c
diff --git
a/server/speaker-network.c
b/server/speaker-network.c
index
2f3750c
..
2d8d2cb
100644
(file)
--- a/
server/speaker-network.c
+++ b/
server/speaker-network.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder
/*
* This file is part of DisOrder
- * Copyright (C) 2005
, 2006, 2007
Richard Kettlewell
+ * Copyright (C) 2005
-2008
Richard Kettlewell
*
* 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
@@
-20,8
+20,7
@@
/** @file server/speaker-network.c
* @brief Support for @ref BACKEND_NETWORK */
/** @file server/speaker-network.c
* @brief Support for @ref BACKEND_NETWORK */
-#include <config.h>
-#include "types.h"
+#include "common.h"
#include <unistd.h>
#include <poll.h>
#include <unistd.h>
#include <poll.h>
@@
-29,7
+28,6
@@
#include <gcrypt.h>
#include <sys/socket.h>
#include <sys/uio.h>
#include <gcrypt.h>
#include <sys/socket.h>
#include <sys/uio.h>
-#include <assert.h>
#include <net/if.h>
#include <ifaddrs.h>
#include <errno.h>
#include <net/if.h>
#include <ifaddrs.h>
#include <errno.h>
@@
-84,24
+82,16
@@
static int audio_errors;
static void network_init(void) {
struct addrinfo *res, *sres;
static const struct addrinfo pref = {
static void network_init(void) {
struct addrinfo *res, *sres;
static const struct addrinfo pref = {
- 0,
- PF_INET,
- SOCK_DGRAM,
- IPPROTO_UDP,
- 0,
- 0,
- 0,
- 0
+ .ai_flags = 0,
+ .ai_family = PF_INET,
+ .ai_socktype = SOCK_DGRAM,
+ .ai_protocol = IPPROTO_UDP,
};
static const struct addrinfo prefbind = {
};
static const struct addrinfo prefbind = {
- AI_PASSIVE,
- PF_INET,
- SOCK_DGRAM,
- IPPROTO_UDP,
- 0,
- 0,
- 0,
- 0
+ .ai_flags = AI_PASSIVE,
+ .ai_family = PF_INET,
+ .ai_socktype = SOCK_DGRAM,
+ .ai_protocol = IPPROTO_UDP,
};
static const int one = 1;
int sndbuf, target_sndbuf = 131072;
};
static const int one = 1;
int sndbuf, target_sndbuf = 131072;