* Remove port_t typedef

for file in $(git grep -l "\<port_t\>"); do sed -i -e 's/\<port_t\>/in_port_t/g' $file; done

src/botnet.c

@@ -985,7 +985,7 @@ int botlink(char *linker, int idx, char *nick)
       correct_handle(nick);
 
       char *address = NULL;
-      port_t port = 0;
+      in_port_t port = 0;
 
       if (unix_domain) {
         address = conf.localhub_socket;

src/chanprog.c

@@ -63,7 +63,7 @@ char			origbotnick[HANDLEN + 1] = "";	/* from -B (placed into conf.bot->nick ..
 char 			origbotname[NICKLEN] = "";	/* Nick to regain */
 char                    jupenick[NICKLEN] = "";
 char 			botname[NICKLEN] = "";	/* IRC nickname */
-port_t     		my_port = 0;
+in_port_t     		my_port = 0;
 int			reset_chans = 0;
 bool                    cookies_disabled = 0;
 char s2_4[3] = "",s1_6[3] = "",s1_11[3] = "";
@@ -605,7 +605,7 @@ void rehash_ip() {
     }
     if (!listening) {
       // Listen on the unix domain socket
-      port_t port;
+      in_port_t port;
       int i = open_listen_addr_by_af(conf.localhub_socket, &port, AF_UNIX);
       if (i < 0) {
         putlog(LOG_ERRORS, "*", "Can't listen on %s - %s", conf.localhub_socket, i == -1 ? "it's taken." : "couldn't assign file.");

src/chanprog.h

@@ -37,7 +37,7 @@ void notice(const char* target, const char* msg, int idx);
 
 extern struct chanset_t		*chanset, *chanset_default;
 extern char			admin[], origbotnick[HANDLEN + 1], origbotname[NICKLEN], jupenick[NICKLEN], botname[NICKLEN], *def_chanset;
-extern port_t			my_port;
+extern in_port_t			my_port;
 extern int			reset_chans;
 extern bool			cookies_disabled;
 

src/cmds.c

@@ -1507,7 +1507,7 @@ static void cmd_chaddr(int idx, char *par)
   putlog(LOG_CMDS, "*", "#%s# chaddr %s %s", dcc[idx].nick, handle, addr);
   dprintf(idx, "Changed bot's address.\n");
 
-  port_t telnet_port = 3333, relay_port = 3333;
+  in_port_t telnet_port = 3333, relay_port = 3333;
   char *p = NULL, *q = NULL;
 #ifdef USE_IPV6
   char *r = NULL;
@@ -4302,7 +4302,7 @@ static void rcmd_jump(char * frombot, char * fromhand, char * fromidx, char * pa
   if (!conf.bot->hub) {
     if (par[0]) {
       char *other = newsplit(&par), *p = NULL;
-      port_t port = atoi(newsplit(&par));
+      in_port_t port = atoi(newsplit(&par));
 
       if ((p = strchr(other, ':'))) {
         *p = 0;

src/conf.h

@@ -38,8 +38,8 @@ typedef struct conf_b {
   char *datadir;
   char *username;       /* shell username */
   char *homedir;        /* homedir */
-  port_t portmin;       /* for hubs, the reserved port range for incoming connections */
-  port_t portmax;       /* for hubs, the reserved port range for incoming connections */
+  in_port_t portmin;       /* for hubs, the reserved port range for incoming connections */
+  in_port_t portmax;       /* for hubs, the reserved port range for incoming connections */
 } conf_t;
 
 extern conf_t		conf;

src/dcc.c

@@ -613,7 +613,7 @@ static void
 dcc_identd_connect(int idx, char *buf, int atr)
 {
   in_addr_t ip;
-  port_t port;
+  in_port_t port;
   int j, sock;
   char s[UHOSTLEN + 1] = "";
 
@@ -1373,7 +1373,7 @@ static void
 dcc_telnet(int idx, char *buf, int ii)
 {
   in_addr_t ip;
-  port_t port;
+  in_port_t port;
   char s[UHOSTLEN + 1] = "";
   int i;
   char x[1024] = "";

src/dcc.h

@@ -61,7 +61,7 @@ struct dcc_t {
 //  int auth;
   bool whowas;
   int dns_id;
-  port_t port;
+  in_port_t port;
   char simulbot[HANDLEN + 1];       /* used for hub->leaf cmd simulation, holds bot that results should be sent to */
   char hash[MD5_HASH_LENGTH + 1];                /* used for dcc authing */
   char shahash[SHA_HASH_LENGTH + 1];
@@ -118,7 +118,7 @@ struct xfer_info {
 struct bot_info {
   int  numver;
   int  uff_flags;               /* user file feature flags              */
-  port_t port;		        /* base port                            */
+  in_port_t port;		        /* base port                            */
   char linker[NOTENAMELEN + 1]; /* who requested this link              */
   char sysname[121];
   char version[121];            /* channel/version info                 */
@@ -132,7 +132,7 @@ struct relay_info {
 #ifdef USE_IPV6
   int af;
 #endif /* USE_IPV6 */
-  port_t port;
+  in_port_t port;
 };
 
 struct dupwait_info {

src/dccutil.c

@@ -878,10 +878,10 @@ do_boot(int idx, const char *by, const char *reason)
 }
 
 int
-listen_all(port_t lport, bool off, bool should_v6)
+listen_all(in_port_t lport, bool off, bool should_v6)
 {
   int idx = -1;
-  port_t port, realport;
+  in_port_t port, realport;
 
 #ifdef USE_IPV6
   int i6 = -1;
@@ -1008,7 +1008,7 @@ identd_open(const char *sourceIp, const char *destIp, int identd)
   {
     int idx;
     int i = -1;
-    port_t port = 113;
+    in_port_t port = 113;
 
     for (idx = 0; idx < dcc_total; idx++)
       if (dcc[idx].type == &DCC_IDENTD_CONNECT)

src/dccutil.h

@@ -7,8 +7,8 @@
 
 /* Public structure for the listening port map */
 struct portmap {
-  port_t realport;
-  port_t mappedto;
+  in_port_t realport;
+  in_port_t mappedto;
   struct portmap *next;
 };
 
@@ -60,7 +60,7 @@ void do_boot(int, const char *, const char *);
 int detect_dcc_flood(time_t *, struct chat_info *, int);
 void identd_open(const char * = NULL, const char * = NULL, int identd = 1);
 void identd_close();
-int listen_all(port_t, bool, bool);
+int listen_all(in_port_t, bool, bool);
 bool valid_idx(int);
 int dcc_read(bd::Stream&);
 void dcc_write(bd::Stream&, int);

src/enclink.c

@@ -38,7 +38,7 @@ static void ghost_link_case(int idx, direction_t direction)
   if (likely(snum >= 0)) {
     char initkey[33] = "", *tmp2 = NULL;
     char *keyp = NULL, *nick1 = NULL, *nick2 = NULL;
-    port_t port = 0;
+    in_port_t port = 0;
     const char salt1[] = SALT1;
     const char salt2[] = SALT2;
 

src/mod/server.mod/server.c

@@ -58,12 +58,12 @@ int ctcp_mode;
 int serv = -1;		/* sock # of server currently */
 int servidx = -1;		/* idx of server */
 char newserver[121] = "";	/* new server? */
-port_t newserverport = 0;		/* new server port? */
+in_port_t newserverport = 0;		/* new server port? */
 char newserverpass[121] = "";	/* new server password? */
 static char serverpass[121] = "";
 static time_t trying_server;	/* trying to connect to a server right now? */
 int curserv = 999;		/* current position in server list: */
-port_t curservport = 0;
+in_port_t curservport = 0;
 rate_t flood_msg = { 5, 60 };
 rate_t flood_ctcp = { 3, 60 };
 char botuserhost[UHOSTLEN] = "";	/* bot's user@host (refreshed whenever the bot joins a channel) */
@@ -86,7 +86,7 @@ static const interval_t stoned_timeout = 500;
 struct server_list *serverlist = NULL;	/* old-style queue, still used by
 					   server list */
 interval_t cycle_time;			/* cycle time till next server connect */
-port_t default_port = 6667;		/* default IRC port */
+in_port_t default_port = 6667;		/* default IRC port */
 bool trigger_on_ignore;	/* trigger bindings if user is ignored ? */
 int answer_ctcp = 1;		/* answer how many stacked ctcp's ? */
 static bool resolvserv;		/* in the process of resolving a server host */
@@ -795,7 +795,7 @@ void clearq(struct server_list *xx)
  *
  * -> if (*ptr == -1) then jump to that particular server
  */
-void next_server(int *ptr, char *servname, port_t *port, char *pass)
+void next_server(int *ptr, char *servname, in_port_t *port, char *pass)
 {
   struct server_list *x = serverlist;
 

src/mod/server.mod/server.h

@@ -33,7 +33,7 @@ struct server_list {
   struct server_list	*next;
   char			*name;
   char			*pass;
-  port_t		 port;
+  in_port_t		 port;
 };
 
 /* Available net types.  */
@@ -50,7 +50,7 @@ extern size_t		nick_len;
 extern bool		trigger_on_ignore, floodless, keepnick, in_deaf, in_callerid, have_cprivmsg, have_cnotice;
 extern int 		servidx, ctcp_mode, answer_ctcp, serv, curserv, default_alines, flood_count, burst;
 extern unsigned int     rolls;
-extern port_t		default_port, newserverport, curservport;
+extern in_port_t		default_port, newserverport, curservport;
 extern time_t		server_online, tried_jupenick, tried_nick, release_time, connect_bursting;
 extern interval_t	cycle_time;
 extern char		cursrvname[], botrealname[121], botuserhost[], ctcp_reply[1024],
@@ -80,7 +80,7 @@ void rehash_monitor_list();
 void replay_cache(int, bd::Stream*);
 void join_chans();
 void check_hostmask();
-void next_server(int *, char *, port_t *, char *);
+void next_server(int *, char *, in_port_t *, char *);
 void server_send_ison();
 void reset_flood();
 

src/mod/server.mod/servmsg.c

@@ -1890,7 +1890,7 @@ static void connect_server(void)
 {
   char pass[121] = "", botserver[UHOSTLEN] = "";
   int newidx;
-  port_t botserverport = 0;
+  in_port_t botserverport = 0;
 
   waiting_for_awake = 0;
   /* trying_server = now; */

src/mod/transfer.mod/transfer.c

@@ -737,7 +737,7 @@ struct dcc_table DCC_GET_PENDING =
 static void dcc_get_pending(int idx, char *buf, int len)
 {
   in_addr_t ip;
-  port_t port;
+  in_port_t port;
   int i;
   char s[UHOSTLEN] = "";
 
@@ -813,7 +813,7 @@ static int raw_dcc_resend_send(char *filename, char *nick, char *from, int resen
 {
   int zz = -1;
   int i;
-  port_t port;
+  in_port_t port;
   char *buf = NULL;
   long dccfilesize;
   FILE *f = NULL, *dccfile = NULL;

src/net.c

@@ -77,7 +77,7 @@ jmp_buf	alarmret;		/* Env buffer for alarm() returns	    */
 
 /* This *MUST* be an ip */
 char   firewall[121] = "";     /* Socks server for firewall                */
-port_t firewallport = 1080;    /* Default port of Sock4/5 firewalls        */
+in_port_t firewallport = 1080;    /* Default port of Sock4/5 firewalls        */
 /* Types of proxy */
 #define PROXY_SOCKS   1
 #define PROXY_SUN     2
@@ -429,7 +429,7 @@ void real_killsock(register int sock, const char *file, int line)
 
 /* Send connection request to proxy
  */
-static int proxy_connect(int sock, const char *ip, port_t port, int proxy_type)
+static int proxy_connect(int sock, const char *ip, in_port_t port, int proxy_type)
 {
   sdprintf("proxy_connect(%d, %s, %d, %d)", sock, ip, port, proxy_type);
 #ifdef USE_IPV6
@@ -476,7 +476,7 @@ static int proxy_connect(int sock, const char *ip, port_t port, int proxy_type)
 }
 
 /* FIXME: REPLACE WITH SOCK_NAME() */
-void initialize_sockaddr(int af_type, const char *host, port_t port, union sockaddr_union *so)
+void initialize_sockaddr(int af_type, const char *host, in_port_t port, union sockaddr_union *so)
 {
     bzero(so, sizeof(*so));
 
@@ -513,9 +513,9 @@ void initialize_sockaddr(int af_type, const char *host, port_t port, union socka
  *   -1  strerror()/errno type error
  *   -2  can't resolve hostname
  */
-int open_telnet_raw(int sock, const char *ipIn, port_t sport, bool proxy_on, int identd)
+int open_telnet_raw(int sock, const char *ipIn, in_port_t sport, bool proxy_on, int identd)
 {
-  static port_t port = 0;
+  static in_port_t port = 0;
   union sockaddr_union so;
   char ip[121] = "";
   int is_resolved = 0;
@@ -611,7 +611,7 @@ int open_telnet_raw(int sock, const char *ipIn, port_t sport, bool proxy_on, int
 }
 
 /* Ordinary non-binary connection attempt */
-int open_telnet(const char *ip, port_t port, bool proxy, int identd)
+int open_telnet(const char *ip, in_port_t port, bool proxy, int identd)
 {
   int sock = -1;
   
@@ -631,9 +631,9 @@ int open_telnet(const char *ip, port_t port, bool proxy, int identd)
  * 'addr' is ignored if af_def is AF_INET6 -poptix (02/03/03)
  */
 #ifdef USE_IPV6
-int open_address_listen(const char* ip, int af_def, port_t *port) {
+int open_address_listen(const char* ip, int af_def, in_port_t *port) {
 #else
-int open_address_listen(const char* ip, port_t *port) {
+int open_address_listen(const char* ip, in_port_t *port) {
    int af_def = AF_INET;
 #endif /* USE_IPV6 */
 //  if (firewall[0]) {
@@ -750,7 +750,7 @@ int open_address_listen(const char* ip, port_t *port) {
 /* Returns a socket number for a listening socket that will accept any
  * connection -- port # is returned in port
  */
-int open_listen(port_t *port)
+int open_listen(in_port_t *port)
 {
 #ifdef USE_IPV6
   return open_address_listen(iptostr(getmyip()), AF_INET, port);
@@ -763,7 +763,7 @@ int open_listen(port_t *port)
  * the above is being left in for compatibility, and should NOT LONGER BE USED IN THE CORE CODE.
  */
 
-int open_listen_by_af(port_t *port, int af_def)
+int open_listen_by_af(in_port_t *port, int af_def)
 {
 #ifdef USE_IPV6
   return open_address_listen(iptostr(getmyip()), af_def, port);
@@ -772,7 +772,7 @@ int open_listen_by_af(port_t *port, int af_def)
 #endif /* USE_IPV6 */
 }
 
-int open_listen_addr_by_af(const char *ip, port_t *port, int af_def)
+int open_listen_addr_by_af(const char *ip, in_port_t *port, int af_def)
 {
   if (!ip)
     ip = iptostr(getmyip());
@@ -799,7 +799,7 @@ char *iptostr(in_addr_t ip)
  * by open_listen ... returns hostname of the caller & the new socket
  * does NOT dispose of old "public" socket!
  */
-int answer(int sock, char *caller, in_addr_t *ip, port_t *port, int binary)
+int answer(int sock, char *caller, in_addr_t *ip, in_port_t *port, int binary)
 {
   int new_sock;
   socklen_t addrlen;
@@ -881,7 +881,7 @@ int answer(int sock, char *caller, in_addr_t *ip, port_t *port, int binary)
  */
 int open_telnet_dcc(int sock, char *ip, char *port)
 {
-  port_t p;
+  in_port_t p;
   unsigned long addr;
   char sv[100] = "";
   unsigned char c[4] = "";

src/net.h

@@ -87,7 +87,7 @@ typedef struct {
   bd::String* inbuf;
   bd::String* outbuf;
   char *host;
-  port_t port;
+  in_port_t port;
   short          flags;
   char okey[ENC_KEY_LEN + 1];                        /* botlink enckey: out */
   char ikey[ENC_KEY_LEN + 1];                        /* botlink enckey: in  */
@@ -114,20 +114,20 @@ int real_getsock(int, const char *, int);
 
 int sockprotocol(int);
 void real_killsock(int, const char *, int);
-int answer(int, char *, in_addr_t *, port_t *, int);
+int answer(int, char *, in_addr_t *, in_port_t *, int);
 int findanysnum(register int);
 int findanyidx(register int sock);
-int open_listen(port_t *);
-int open_listen_by_af(port_t *, int);
-int open_listen_addr_by_af(const char*, port_t *, int);
+int open_listen(in_port_t *);
+int open_listen_by_af(in_port_t *, int);
+int open_listen_addr_by_af(const char*, in_port_t *, int);
 #ifdef USE_IPV6
-int open_address_listen(const char*, int, port_t *);
+int open_address_listen(const char*, int, in_port_t *);
 #else
-int open_address_listen(const char*, port_t *);
+int open_address_listen(const char*, in_port_t *);
 #endif /* USE_IPV6 */
-int open_telnet(const char *, port_t, bool proxy = 0, int identd = 0);
+int open_telnet(const char *, in_port_t, bool proxy = 0, int identd = 0);
 int open_telnet_dcc(int, char *, char *);
-int open_telnet_raw(int, const char *, port_t, bool, int = 0);
+int open_telnet_raw(int, const char *, in_port_t, bool, int = 0);
 void tputs(int, const char *, size_t);
 void dequeue_sockets();
 int sockgets(char *, int *);
@@ -149,7 +149,7 @@ extern unsigned long			notalloc;
 extern char				firewall[], botuser[21];
 extern int				MAXSOCKS, socks_total;
 extern bool				identd_hack, cached_ip;
-extern port_t				firewallport;
+extern in_port_t				firewallport;
 extern jmp_buf				alarmret;
 extern sock_list			*socklist;
 

src/socket.h

@@ -28,7 +28,7 @@ typedef struct {
 //#define SOCKNAME_INADDR(x) (((x).family == AF_INET6) ? x.u.ipv6.sin6_addr : x.u.ipv4.sin_addr)
 //#define SOCKNAME_ADDR(x) (((x).family == AF_INET6) ? x.u.ipv6.sin6_addr.s6_addr : x.u.ipv4.sin_addr.s_addr)
 
-int socket_name(sockname_t *name, const char *ipaddr, port_t port);
+int socket_name(sockname_t *name, const char *ipaddr, in_port_t port);
 
 
 /* globals */

src/types.h

@@ -20,9 +20,6 @@ typedef int (*Function) ();
 typedef int socklen_t;
 #endif
 
-/* port */
-typedef in_port_t		port_t;
-
 // Signed so that it can play nice with time_t
 typedef int			interval_t;
 

src/users.h

@@ -62,8 +62,8 @@ struct bot_addr {
   char *address;
   char *uplink;
   unsigned short hublevel;
-  port_t telnet_port;
-  port_t relay_port;
+  in_port_t telnet_port;
+  in_port_t relay_port;
 };
 
 struct user_entry {