Merge of trunk into branch 1.6.x.

git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.6.x@339 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Marcelo Roberto Jimenez
2008-03-25 10:21:08 +00:00
parent 1c9632dcc3
commit 4b40e94b03
46 changed files with 2964 additions and 334 deletions

View File

@@ -35,6 +35,7 @@
************************************************************************/
#include "config.h"
#ifndef WIN32
#include <arpa/inet.h>
#include <netinet/in.h>
@@ -48,6 +49,7 @@
typedef int socklen_t;
#define EAFNOSUPPORT 97
#endif /* WIN32 */
#include "unixutil.h"
#include "ithread.h"
@@ -65,7 +67,6 @@
#include "ThreadPool.h"
#include "httpreadwrite.h"
#include "statcodes.h"
#include "upnp.h"
#include "upnpapi.h"
#define APPLICATION_LISTENING_PORT 49152
@@ -378,10 +379,7 @@ schedule_request_job( IN int connfd,
static void
RunMiniServer( MiniServerSockArray *miniSock )
{
// strerror_r() buffer
const int ERROR_BUFFER_LEN = 256;
char errorBuffer[ERROR_BUFFER_LEN];
struct sockaddr_in clientAddr;
socklen_t clientLen;
SOCKET connectHnd;
@@ -550,10 +548,7 @@ int
get_miniserver_sockets( MiniServerSockArray * out,
unsigned short listen_port )
{
// strerror_r() buffer
const int ERROR_BUFFER_LEN = 256;
char errorBuffer[ERROR_BUFFER_LEN];
struct sockaddr_in serverAddr;
int listenfd;
int success;
@@ -817,10 +812,7 @@ StartMiniServer( unsigned short listen_port )
int
StopMiniServer()
{
// strerror_r() buffer
const int ERROR_BUFFER_LEN = 256;
char errorBuffer[ERROR_BUFFER_LEN];
int socklen = sizeof( struct sockaddr_in );
int sock;
struct sockaddr_in ssdpAddr;