- added ftp port # as an ini setting and added to UPNP for router auto-config

- added new language string for message box to prompt map file downloads
This commit is contained in:
Mark Vejvoda
2010-12-29 20:28:25 +00:00
parent be9d8859d4
commit 4fb1b1092f
13 changed files with 72 additions and 32 deletions

View File

@@ -44,7 +44,7 @@ LOCAL socket_t server;
* @return - 0: server started successfully
* - -1: could not create server socket
*/
int ftpStart(void)
int ftpStart(int portNumber)
{
server = -1; // set server socket to invalid value
@@ -57,7 +57,7 @@ int ftpStart(void)
printf(". Creating server socket");
#endif
server = ftpCreateServerSocket(); // create main listener socket
server = ftpCreateServerSocket(portNumber); // create main listener socket
if(server < 0)
{
#if DBG_LOG

View File

@@ -287,7 +287,7 @@ socket_t ftpAcceptDataConnection(socket_t listner)
return dataSocket;
}
socket_t ftpCreateServerSocket(void)
socket_t ftpCreateServerSocket(int portNumber)
{
int theServer;
struct sockaddr_in serverinfo;
@@ -299,7 +299,7 @@ socket_t ftpCreateServerSocket(void)
serverinfo.sin_family = AF_INET;
serverinfo.sin_addr.s_addr = INADDR_ANY;
serverinfo.sin_port = htons(61358);
serverinfo.sin_port = htons(portNumber);
len = sizeof(serverinfo);
if(bind(theServer, (struct sockaddr *)&serverinfo, len))

View File

@@ -317,7 +317,7 @@ socket_t ftpAcceptDataConnection(socket_t listner)
return (socket_t)dataSocket;
}
socket_t ftpCreateServerSocket(void)
socket_t ftpCreateServerSocket(int portNumber)
{
SOCKET theServer;
struct sockaddr_in serverinfo;
@@ -330,9 +330,9 @@ socket_t ftpCreateServerSocket(void)
serverinfo.sin_family = AF_INET;
serverinfo.sin_addr.s_addr = INADDR_ANY;
serverinfo.sin_port = htons(21);
serverinfo.sin_port = htons(portNumber);
len = sizeof(serverinfo);
#ifndef WIN32
setsockopt(theServer, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
#else