1 files changed, 9 insertions, 7 deletions

diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp
index 3ff1500..0c5c19b 100755
--- a/PumpKINDlg.cpp
+++ b/PumpKINDlg.cpp
@@ -1225,12 +1225,13 @@ CPropsACL acl;
 	server.m_TFTPSubdirs=m_bTFTPSubdirs;

 	server.m_WRQMode=m_WRQMode;

 	server.m_PromptTimeOut=m_PromptTimeOut;

 	server.m_LogFile=m_LogFile;

 

 	network.m_ListenPort=m_ListenPort;

+	network.m_ListenAddress=m_ListenAddress;

 	network.m_SpeakPort=m_SpeakPort;

 	network.m_TimeOut=m_TFTPTimeOut.GetTotalSeconds();

 	network.m_BlockSize=m_BlockSize;

 

 	sounds.m_Request = m_bnwRequest;

 	sounds.m_Success = m_bnwSuccess;

@@ -1248,12 +1249,13 @@ CPropsACL acl;
 		m_bTFTPSubdirs=server.m_TFTPSubdirs;

 		m_WRQMode=server.m_WRQMode;

 		m_PromptTimeOut=server.m_PromptTimeOut;

 		m_LogFile=server.m_LogFile;

 

 		m_ListenPort=network.m_ListenPort;

+		m_ListenAddress=network.m_ListenAddress;

 		m_SpeakPort=network.m_SpeakPort;

 		m_TFTPTimeOut=CTimeSpan(network.m_TimeOut);

 		m_BlockSize=network.m_BlockSize;

 

 		m_bnwRequest = sounds.m_Request;

 		m_bnwSuccess = sounds.m_Success;

@@ -1872,12 +1874,13 @@ CWinApp *app = AfxGetApp();
 	m_bListen=app->GetProfileInt("TFTPSettings","Listen",m_bListen);

 	m_bnwRequest=app->GetProfileString("BellsNWhistles","Request",m_bnwRequest);

 	m_bnwSuccess=app->GetProfileString("BellsNWhistles","Success",m_bnwSuccess);

 	m_bnwAbort=app->GetProfileString("BellsNWhistles","Abort",m_bnwAbort);

 	m_bTFTPSubdirs=app->GetProfileInt("TFTPSettings","Subdirs",m_bTFTPSubdirs);

 	m_ListenPort=app->GetProfileInt("TFTPSettings","ListenPort",m_ListenPort);

+	m_ListenAddress=app->GetProfileString("TFTPSettings","ListenAddress",m_ListenAddress);

 	m_LogLength=app->GetProfileInt("UISettings","LogLength",m_LogLength);

 	m_PromptTimeOut=app->GetProfileInt("UISettings","PromptTimeout",m_PromptTimeOut);

 	m_RRQMode=app->GetProfileInt("TFTPSettings","RRQMode",m_RRQMode);

 	m_SpeakPort=app->GetProfileInt("TFTPSettings","SpeakPort",m_SpeakPort);

 	m_TFTPRoot=app->GetProfileString("TFTPSettings","TFTPRoot",m_TFTPRoot);

 	m_LogFile=app->GetProfileString("General","LogFile",m_LogFile);

@@ -1902,12 +1905,13 @@ CWinApp *app = AfxGetApp();
 	app->WriteProfileInt("TFTPSettings","Listen",m_bListen);

 	app->WriteProfileString("BellsNWhistles","Request",m_bnwRequest);

 	app->WriteProfileString("BellsNWhistles","Success",m_bnwSuccess);

 	app->WriteProfileString("BellsNWhistles","Abort",m_bnwAbort);

 	app->WriteProfileInt("TFTPSettings","Subdirs",m_bTFTPSubdirs);

 	app->WriteProfileInt("TFTPSettings","ListenPort",m_ListenPort);

+	app->WriteProfileString("TFTPSettings","ListenAddress",m_ListenAddress);

 	app->WriteProfileInt("UISettings","LogLength",m_LogLength);

 	app->WriteProfileInt("UISettings","PromptTimeout",m_PromptTimeOut);

 	app->WriteProfileInt("TFTPSettings","RRQMode",m_RRQMode);

 	app->WriteProfileInt("TFTPSettings","SpeakPort",m_SpeakPort);

 	app->WriteProfileString("TFTPSettings","TFTPRoot",m_TFTPRoot);

 	app->WriteProfileString("General","LogFile",m_LogFile);

@@ -2064,22 +2068,20 @@ void CPumpKINDlg::OnHelp()
 {

 	AfxGetApp()->WinHelp(0,HELP_FINDER);	

 }

 

 BOOL CListenSocket::SetListen(BOOL b) {

 	ASSERT(m_Daddy);

-	if(b==m_bListen)

-		return TRUE;

-	if(b) {

-		if(!Create(m_Daddy->m_ListenPort,SOCK_DGRAM))

-			return FALSE;

-		return m_bListen=TRUE;

-	}else{

+	if(b==m_bListen) return TRUE;

+	if(!b) {

 		Close(); m_bListen=FALSE;

 		return TRUE;

 	}

+	return m_bListen=Create(m_Daddy->m_ListenPort,SOCK_DGRAM,

+		FD_READ|FD_WRITE|FD_OOB|FD_ACCEPT|FD_CONNECT|FD_CLOSE,

+		m_Daddy->m_ListenAddress.IsEmpty()?NULL:(LPCTSTR)m_Daddy->m_ListenAddress);

 }

 

 void CPumpKINDlg::OnListening() 

 {

 	if(!m_Listener.SetListen(m_ListenCtl.GetCheck()==1)) {

 		TRACE0("Failed to create socket\n");