empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix xdump nat column ip for connections from "long" IPv6 addresses

Browse source 
Broken in commit 3a7d7fa, which enlarged struct natstr member
nat_hostaddr[] from 32 to 46 characters, but neglected to update the
ca_len in nat_ca[].  Consequently, the address is truncated in xdump.
Can also break country * ?ip=... and such, but that's exotic.
This commit is contained in:
Markus Armbruster 2013-04-29 21:29:51 +02:00
parent c016c5fe76
commit 4884eddb51
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/common/nsc.c
View file

@ -559,7 +559,7 @@ struct castr cou_ca[] = {
{"cname", fldoff(nat_cnam), NSC_STRINGY, 20, NULL, EF_BAD, NSC_EXTRA},
{"passwd", fldoff(nat_pnam), NSC_STRINGY, 20, NULL,
EF_BAD, NSC_DEITY | NSC_EXTRA},
{"ip", fldoff(nat_hostaddr), NSC_STRINGY, 32, NULL, EF_BAD, 0},
{"ip", fldoff(nat_hostaddr), NSC_STRINGY, 46, NULL, EF_BAD, 0},
{"hostname", fldoff(nat_hostname), NSC_STRINGY, 512, NULL, EF_BAD, 0},
{"userid", fldoff(nat_userid), NSC_STRINGY, 32, NULL, EF_BAD, 0},
{"xcap", fldoff(nat_xcap), NSC_XCOORD, 0, NULL, EF_BAD, 0},

6
tests/smoke/smoke.out
View file

@ -255,7 +255,7 @@ Player 00 Turn 00 starting
"flags" 8 9 0 36
"cname" 14 0 20 -1
"passwd" 14 1 20 -1
"ip" 14 1 32 -1
"ip" 14 1 46 -1
"hostname" 14 1 512 -1
"userid" 14 1 32 -1
"xcap" 9 1 0 -1
@ -746,7 +746,7 @@ Player 00 Turn 00 starting
[0:640] Command : XDUMP meta country 0
"cnum" 5 0 0 9
"flags" 8 8 0 36
"ip" 14 0 32 -1
"ip" 14 0 46 -1
"hostname" 14 0 512 -1
"userid" 14 0 32 -1
"xcap" 9 0 0 -1
@ -1633,7 +1633,7 @@ CENSUS del dst
[0:636] Command : XDUMP meta country 0
"cnum" 5 0 0 9
"flags" 8 8 0 36
"ip" 14 0 32 -1
"ip" 14 0 46 -1
"hostname" 14 0 512 -1
"userid" 14 0 32 -1
"xcap" 9 0 0 -1