gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 02:19:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r15978) -Codechange: support parsing [] enclosed IPv6 addresses.

Browse Source
This commit is contained in:
rubidium 2009-04-08 01:22:57 +00:00
parent 20e82c46d3
commit a5a424ce28
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/core/address.h
View File

@ -96,7 +96,7 @@ public:
if (StrEmpty(hostname)) hostname = ""; if (StrEmpty(hostname)) hostname = "";
if (*hostname == '[') hostname++; if (*hostname == '[') hostname++;
strecpy(this->hostname, StrEmpty(hostname) ? "" : hostname, lastof(this->hostname)); strecpy(this->hostname, StrEmpty(hostname) ? "" : hostname, lastof(this->hostname));
char *tmp = strrchr(hostname, ']'); char *tmp = strrchr(this->hostname, ']');
if (tmp != NULL) *tmp = '\0'; if (tmp != NULL) *tmp = '\0';
memset(&this->address, 0, sizeof(this->address)); memset(&this->address, 0, sizeof(this->address));

11
src/network/network.cpp
View File

@ -374,14 +374,25 @@ static void CheckMinActiveClients()
* occupied by connection_string. */ * occupied by connection_string. */
void ParseConnectionString(const char **company, const char **port, char *connection_string) void ParseConnectionString(const char **company, const char **port, char *connection_string)
{ {
bool ipv6 = false;
char *p; char *p;
for (p = connection_string; *p != '\0'; p++) { for (p = connection_string; *p != '\0'; p++) {
switch (*p) { switch (*p) {
case '[':
ipv6 = true;
break;
case ']':
ipv6 = false;
break;
case '#': case '#':
*company = p + 1; *company = p + 1;
*p = '\0'; *p = '\0';
break; break;
case ':': case ':':
if (ipv6) break;
*port = p + 1; *port = p + 1;
*p = '\0'; *p = '\0';
break; break;