oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Removing the getBoundPort() function and just making boundPort an extern.

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@6445 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman
2007-06-01 17:44:03 +00:00
parent 485d1f68dd
commit 88638f4821
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/listen.c
View File

@@ -48,7 +48,7 @@
static int *listenSockets; static int *listenSockets;
static int numberOfListenSockets; static int numberOfListenSockets;
static int boundPort; int boundPort;
static int establishListen(unsigned int port, static int establishListen(unsigned int port,
struct sockaddr *addrp, socklen_t addrlen) struct sockaddr *addrp, socklen_t addrlen)
@@ -251,8 +251,3 @@ void getConnections(fd_set * fds)
} }
} }
} }
int getBoundPort(void)
{
return boundPort;
}

4
src/listen.h
View File

@@ -26,6 +26,8 @@
#include <unistd.h> #include <unistd.h>
#include <sys/select.h> #include <sys/select.h>
extern int boundPort;
void listenOnPort(void); void listenOnPort(void);
void getConnections(fd_set * fds); void getConnections(fd_set * fds);
@@ -36,6 +38,4 @@ void freeAllListenSockets(void);
/* fdmax should be initialized to something */ /* fdmax should be initialized to something */
void addListenSocketsToFdSet(fd_set * fds, int *fdmax); void addListenSocketsToFdSet(fd_set * fds, int *fdmax);
int getBoundPort(void);
#endif #endif

2
src/zeroconf.c
View File

@@ -255,7 +255,7 @@ static void avahiRegisterService(AvahiClient *c)
AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0,
avahiName, SERVICE_TYPE, avahiName, SERVICE_TYPE,
NULL, NULL, NULL, NULL,
getBoundPort(), boundPort,
NULL); NULL);
if( ret < 0 ) { if( ret < 0 ) {
ERROR( "Avahi: Failed to add service %s: %s\n", SERVICE_TYPE, avahi_strerror(ret) ); ERROR( "Avahi: Failed to add service %s: %s\n", SERVICE_TYPE, avahi_strerror(ret) );