diff options
| author | oy <Tom_Adams@web.de> | 2011-05-02 17:48:53 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-05-02 17:48:53 +0200 |
| commit | 6e9a799089ef4689799d095d69a4cd0e790abdd9 (patch) | |
| tree | b4dc7b1588aea45d605b27f4cbff407ca532047b | |
| parent | bda0927a87df404299f78347babf7d901253dd4a (diff) | |
| parent | b60dc13fbb9c40f8baaa29d6a057a0ab1decbbcc (diff) | |
| download | zcatch-6e9a799089ef4689799d095d69a4cd0e790abdd9.tar.gz zcatch-6e9a799089ef4689799d095d69a4cd0e790abdd9.zip | |
Merge branch 'master' of github.com:oy/teeworlds
| -rw-r--r-- | src/base/system.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/base/system.c b/src/base/system.c index 94481f21..9cc7f690 100644 --- a/src/base/system.c +++ b/src/base/system.c @@ -571,13 +571,23 @@ int net_addr_comp(const NETADDR *a, const NETADDR *b) void net_addr_str(const NETADDR *addr, char *string, int max_length) { if(addr->type == NETTYPE_IPV4) - str_format(string, max_length, "%d.%d.%d.%d:%d", addr->ip[0], addr->ip[1], addr->ip[2], addr->ip[3], addr->port); + { + if(addr->port != 0) + str_format(string, max_length, "%d.%d.%d.%d:%d", addr->ip[0], addr->ip[1], addr->ip[2], addr->ip[3], addr->port); + else + str_format(string, max_length, "%d.%d.%d.%d", addr->ip[0], addr->ip[1], addr->ip[2], addr->ip[3]); + } else if(addr->type == NETTYPE_IPV6) { - str_format(string, max_length, "[%x:%x:%x:%x:%x:%x:%x:%x]:%d", - (addr->ip[0]<<8)|addr->ip[1], (addr->ip[2]<<8)|addr->ip[3], (addr->ip[4]<<8)|addr->ip[5], (addr->ip[6]<<8)|addr->ip[7], - (addr->ip[8]<<8)|addr->ip[9], (addr->ip[10]<<8)|addr->ip[11], (addr->ip[12]<<8)|addr->ip[13], (addr->ip[14]<<8)|addr->ip[15], - addr->port); + if(addr->port != 0) + str_format(string, max_length, "[%x:%x:%x:%x:%x:%x:%x:%x]:%d", + (addr->ip[0]<<8)|addr->ip[1], (addr->ip[2]<<8)|addr->ip[3], (addr->ip[4]<<8)|addr->ip[5], (addr->ip[6]<<8)|addr->ip[7], + (addr->ip[8]<<8)|addr->ip[9], (addr->ip[10]<<8)|addr->ip[11], (addr->ip[12]<<8)|addr->ip[13], (addr->ip[14]<<8)|addr->ip[15], + addr->port); + else + str_format(string, max_length, "[%x:%x:%x:%x:%x:%x:%x:%x]", + (addr->ip[0]<<8)|addr->ip[1], (addr->ip[2]<<8)|addr->ip[3], (addr->ip[4]<<8)|addr->ip[5], (addr->ip[6]<<8)|addr->ip[7], + (addr->ip[8]<<8)|addr->ip[9], (addr->ip[10]<<8)|addr->ip[11], (addr->ip[12]<<8)|addr->ip[13], (addr->ip[14]<<8)|addr->ip[15]); } else str_format(string, max_length, "unknown type %d", addr->type); |