mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r82) -Fix ttd.rc issues on non VS compilers 

-Fix: network.c more robust (check for NULL pointer), if gethostbyname failes, try resolving IP address
release/0.4.5
darkvater 2004-08-19 09:37:23 +00:00
parent add3151b11
commit dd5f3bbe37
2 changed files with 172 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
network.c
View File

@ -1116,11 +1116,21 @@ void NetworkIPListInit() {
DEBUG(misc,0) ("iplist: init for host %s", hostname); DEBUG(misc,0) ("iplist: init for host %s", hostname);
he=gethostbyname((char *) hostname); he=gethostbyname((char *) hostname);
while(he->h_addr_list[i]) { if (he == NULL) {
bcaddr = inet_addr(inet_ntoa(*(struct in_addr *) he->h_addr_list[i])); DEBUG(misc, 0) ("iplist: gethostbyname failed for host %s...trying with IP address", hostname);
_network_ip_list[i]=bcaddr; bcaddr = inet_addr(hostname);
DEBUG(misc,0) ("iplist: add %s",inet_ntoa(*(struct in_addr *) he->h_addr_list[i])); he = gethostbyaddr(inet_ntoa(*(struct in_addr *)bcaddr), sizeof(bcaddr), AF_INET);
i++; }
if (he == NULL) {
DEBUG(misc, 0) ("iplist: cannot resolve %s", hostname);
} else {
while(he->h_addr_list[i]) {
bcaddr = inet_addr(inet_ntoa(*(struct in_addr *) he->h_addr_list[i]));
_network_ip_list[i]=bcaddr;
DEBUG(misc,0) ("iplist: add %s",inet_ntoa(*(struct in_addr *) he->h_addr_list[i]));
i++;
}
} }
_network_ip_list[i]=0; _network_ip_list[i]=0;

310
ttd.rc
View File

@ -1,153 +1,157 @@
// Microsoft Visual C++ generated resource script. //Microsoft Developer Studio generated resource script.
// //
#include "resrc1.h" #define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
#define APSTUDIO_READONLY_SYMBOLS //
///////////////////////////////////////////////////////////////////////////// // Generated from the TEXTINCLUDE 2 resource.
// //
// Generated from the TEXTINCLUDE 2 resource. #include "resource.h"
// #define APSTUDIO_HIDDEN_SYMBOLS
#include "resource.h" #include "windows.h"
#define APSTUDIO_HIDDEN_SYMBOLS #undef APSTUDIO_HIDDEN_SYMBOLS
#include "windows.h" #include "afxres.h"
#undef APSTUDIO_HIDDEN_SYMBOLS
#include "winres.h" /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS /////////////////////////////////////////////////////////////////////////////
// Neutral (Default) resources
/////////////////////////////////////////////////////////////////////////////
// Neutral (Default) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
#ifdef _WIN32
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD) LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
#ifdef _WIN32 #pragma code_page(1252)
LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT #endif //_WIN32
#pragma code_page(1252)
#endif //_WIN32 /////////////////////////////////////////////////////////////////////////////
//
///////////////////////////////////////////////////////////////////////////// // Icon
// //
// Icon
// // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
// Icon with lowest ID value placed first to ensure application icon 100 ICON DISCARDABLE "mainicon.ico"
// remains consistent on all systems.
100 ICON "mainicon.ico" /////////////////////////////////////////////////////////////////////////////
//
///////////////////////////////////////////////////////////////////////////// // Dialog
// //
// Dialog
// 100 DIALOG DISCARDABLE 0, 0, 305, 70
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
100 DIALOGEX 0, 0, 305, 70 CAPTION "Fatal Application Failure"
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif"
CAPTION "Fatal Application Failure" BEGIN
FONT 8, "MS Sans Serif", 0, 0, 0x0 PUSHBUTTON "&Close",12,7,49,50,14
BEGIN PUSHBUTTON "&Submit report",14,81,49,68,14,WS_DISABLED
PUSHBUTTON "&Close",12,7,49,50,14 PUSHBUTTON "&Emergency save",13,155,49,68,14
PUSHBUTTON "&Submit report",14,81,49,68,14,WS_DISABLED PUSHBUTTON "",15,243,49,55,14,WS_DISABLED
PUSHBUTTON "&Emergency save",13,155,49,68,14 EDITTEXT 11,7,70,291,118,ES_MULTILINE | ES_READONLY | WS_VSCROLL |
PUSHBUTTON "",15,243,49,55,14,WS_DISABLED WS_HSCROLL | NOT WS_TABSTOP
EDITTEXT 11,7,70,291,118,ES_MULTILINE | ES_READONLY | WS_VSCROLL | LTEXT "",10,36,7,262,34
WS_HSCROLL | NOT WS_TABSTOP ICON 100,IDC_STATIC,9,9,20,20
LTEXT "",10,36,7,262,34 END
ICON 100,IDC_STATIC,9,9,20,20
END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////// //
// // Version
// Version //
//
VS_VERSION_INFO VERSIONINFO
VS_VERSION_INFO VERSIONINFO FILEVERSION 0,3,3,0
FILEVERSION 0,3,3,0 PRODUCTVERSION 0,3,3,0
PRODUCTVERSION 0,3,3,0 FILEFLAGSMASK 0x3fL
FILEFLAGSMASK 0x3fL #ifdef _DEBUG
#ifdef _DEBUG FILEFLAGS 0x1L
FILEFLAGS 0x1L #else
#else FILEFLAGS 0x0L
FILEFLAGS 0x0L #endif
#endif FILEOS 0x4L
FILEOS 0x4L FILETYPE 0x1L
FILETYPE 0x1L FILESUBTYPE 0x0L
FILESUBTYPE 0x0L BEGIN
BEGIN BLOCK "StringFileInfo"
BLOCK "StringFileInfo" BEGIN
BEGIN BLOCK "000004b0"
BLOCK "000004b0" BEGIN
BEGIN VALUE "Comments", "This program is licensed under the GNU General Public License.\0"
VALUE "Comments", "This program is licensed under the GNU General Public License." VALUE "CompanyName", "OpenTTD Developers\0"
VALUE "CompanyName", "OpenTTD Developers" VALUE "FileDescription", "OpenTTD\0"
VALUE "FileDescription", "OpenTTD" VALUE "FileVersion", "0.3.3.0\0"
VALUE "FileVersion", "0.3.3.0" VALUE "InternalName", "openttd\0"
VALUE "InternalName", "openttd" VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2004. All Rights Reserved.\0"
VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2004. All Rights Reserved." VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "openttd.exe" VALUE "OriginalFilename", "openttd.exe\0"
VALUE "ProductName", "OpenTTD" VALUE "PrivateBuild", "\0"
VALUE "ProductVersion", "0.3.3.0" VALUE "ProductName", "OpenTTD\0"
END VALUE "ProductVersion", "0.3.3.0\0"
END VALUE "SpecialBuild", "\0"
BLOCK "VarFileInfo" END
BEGIN END
VALUE "Translation", 0x0, 1200 BLOCK "VarFileInfo"
END BEGIN
END VALUE "Translation", 0x0, 1200
END
#endif // Neutral (Default) resources END
/////////////////////////////////////////////////////////////////////////////
#endif // !_MAC
///////////////////////////////////////////////////////////////////////////// #endif // Neutral (Default) resources
// Swedish resources /////////////////////////////////////////////////////////////////////////////
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)
#ifdef _WIN32 /////////////////////////////////////////////////////////////////////////////
LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT // Swedish resources
#pragma code_page(1252)
#endif //_WIN32 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)
#ifdef _WIN32
#ifdef APSTUDIO_INVOKED LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
///////////////////////////////////////////////////////////////////////////// #pragma code_page(1252)
// #endif //_WIN32
// TEXTINCLUDE
// #ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
1 TEXTINCLUDE //
BEGIN // TEXTINCLUDE
"resrc1.h\0" //
END
1 TEXTINCLUDE DISCARDABLE
2 TEXTINCLUDE BEGIN
BEGIN "resrc1.h\0"
"#include ""resource.h""\r\n" END
"#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
"#include ""windows.h""\r\n" 2 TEXTINCLUDE DISCARDABLE
"#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" BEGIN
"#include ""winres.h""\r\n" "#include ""resource.h""\r\n"
"\0" "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
END "#include ""windows.h""\r\n"
"#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
3 TEXTINCLUDE "#include ""winres.h""\r\n"
BEGIN "\0"
"\r\n" END
"\0"
END 3 TEXTINCLUDE DISCARDABLE
BEGIN
#endif // APSTUDIO_INVOKED "\r\n"
"\0"
#endif // Swedish resources END
/////////////////////////////////////////////////////////////////////////////
#endif // APSTUDIO_INVOKED
#endif // Swedish resources
#ifndef APSTUDIO_INVOKED /////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
// #ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
///////////////////////////////////////////////////////////////////////////// // Generated from the TEXTINCLUDE 3 resource.
#endif // not APSTUDIO_INVOKED //
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED