Really fix accepting connections from "long" IPv6 address

[empserver] / include / nat.h

diff --git a/include/nat.h b/include/nat.h
index 2ca457d8c6ba0b4bfec2592fca4d73d9ae66933b..fd01289e7304c0c22a7a99b57055ccdb7b39b26b 100644 (file)
--- a/include/nat.h
+++ b/include/nat.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -93,7 +93,7 @@ struct natstr {
     enum nat_status nat_stat;
     char nat_cnam[20];         /* country name */
     char nat_pnam[20];         /* representative */
-    char nat_hostaddr[32];     /* host addr of last user */
+    char nat_hostaddr[46];     /* host addr of last user */
     char nat_hostname[512];    /* hostname of last user, may be empty */
     char nat_userid[32];       /* userid of last user, may be empty */
     coord nat_xcap, nat_ycap;  /* cap location in abs coords */
@@ -177,8 +177,9 @@ extern void putreject(struct natstr *np, natid them, int how, int what);
 extern void putcontact(struct natstr *np, natid them, int contact);
 extern void agecontact(struct natstr *np);
 extern int influx(struct natstr *np);
+extern struct natstr *nat_reset(struct natstr *, natid, char *, char *,
+                               enum nat_status);
 
-extern struct natstr *nat_reset(struct natstr *, natid, enum nat_status);
 extern int check_nat_name(char *, natid);
 
 extern int grant_btus(struct natstr *, int);