VirtualBox

Changeset 20306 in vbox for trunk/src/VBox/Devices


Ignore:
Timestamp:
Jun 5, 2009 9:16:10 AM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
48201
Message:

NAT: compile fixes

Location:
trunk/src/VBox/Devices/Network/slirp
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/src/VBox/Devices/Network/slirp/debug.h

    r15074 r20306  
    6060#endif  /* !LOG_ENABLED */
    6161
    62 int debug_init _P((void));
    63 void ipstats _P((PNATState));
    64 void tcpstats _P((PNATState));
    65 void udpstats _P((PNATState));
    66 void icmpstats _P((PNATState));
    67 void mbufstats _P((PNATState));
    68 void sockstats _P((PNATState));
     62int debug_init (void);
     63void ipstats (PNATState);
     64void tcpstats (PNATState);
     65void udpstats (PNATState);
     66void icmpstats (PNATState);
     67void mbufstats (PNATState);
     68void sockstats (PNATState);
    6969

  • TabularUnified trunk/src/VBox/Devices/Network/slirp/ip_icmp.h

    r16511 r20306  
    167167        (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
    168168
    169 void icmp_input _P((PNATState, struct mbuf *, int));
    170 void icmp_error _P((PNATState, struct mbuf *, u_char, u_char, int, const char *));
    171 void icmp_reflect _P((PNATState, struct mbuf *));
     169void icmp_input (PNATState, struct mbuf *, int);
     170void icmp_error (PNATState, struct mbuf *, u_char, u_char, int, const char *);
     171void icmp_reflect (PNATState, struct mbuf *);
    172172
    173173struct icmp_msg
    … …  
    180180LIST_HEAD(icmp_storage, icmp_msg);
    181181
    182 int icmp_init _P((PNATState ));
    183 struct icmp_msg * icmp_find_original_mbuf _P((PNATState , struct ip *));
     182int icmp_init (PNATState );
     183struct icmp_msg * icmp_find_original_mbuf (PNATState , struct ip *);
    184184
    185185#endif

  • TabularUnified trunk/src/VBox/Devices/Network/slirp/mbuf.h

    r20164 r20306  
    137137extern int mbuf_max;
    138138
    139 void m_init _P((PNATState));
    140 void msize_init _P((PNATState));
    141 struct mbuf * m_get _P((PNATState));
    142 void m_free _P((PNATState, struct mbuf *));
    143 void m_cat _P((PNATState, register struct mbuf *, register struct mbuf *));
    144 void m_inc _P((struct mbuf *, int));
    145 void m_adj _P((struct mbuf *, int));
    146 int m_copy _P((struct mbuf *, struct mbuf *, int, int));
    147 struct mbuf * dtom _P((PNATState, void *));
     139void m_init (PNATState);
     140void msize_init (PNATState);
     141struct mbuf * m_get (PNATState);
     142void m_free (PNATState, struct mbuf *);
     143void m_cat (PNATState, register struct mbuf *, register struct mbuf *);
     144void m_inc (struct mbuf *, int);
     145void m_adj (struct mbuf *, int);
     146int m_copy (struct mbuf *, struct mbuf *, int, int);
     147struct mbuf * dtom (PNATState, void *);
    148148
    149149/*

  • TabularUnified trunk/src/VBox/Devices/Network/slirp/misc.h

    r15093 r20306  
    6060extern int x_port, x_server, x_display;
    6161
    62 int show_x _P((char *, struct socket *));
    63 void redir_x _P((u_int32_t, int, int, int));
    64 void getouraddr _P((PNATState));
    65 void slirp_insque  _P((PNATState, void *, void *));
    66 void slirp_remque  _P((PNATState, void *));
    67 int add_exec _P((struct ex_list **, int, char *, int, int));
    68 int slirp_openpty _P((int *, int *));
    69 int fork_exec _P((PNATState, struct socket *, char *, int));
    70 void snooze_hup _P((int));
    71 void snooze _P((void));
    72 void relay _P((int));
    73 void add_emu _P((char *));
    74 void fd_nonblock _P((int));
    75 void fd_block _P((int));
     62int show_x (char *, struct socket *);
     63void redir_x (u_int32_t, int, int, int);
     64void getouraddr (PNATState);
     65void slirp_insque  (PNATState, void *, void *);
     66void slirp_remque  (PNATState, void *);
     67int add_exec (struct ex_list **, int, char *, int, int);
     68int slirp_openpty (int *, int *);
     69int fork_exec (PNATState, struct socket *, char *, int);
     70void snooze_hup (int);
     71void snooze (void);
     72void relay (int);
     73void add_emu (char *);
     74void fd_nonblock (int);
     75void fd_block (int);
    7676
    7777#endif

  • TabularUnified trunk/src/VBox/Devices/Network/slirp/sbuf.h

    r14964 r20306  
    2323};
    2424
    25 void sbfree _P((struct sbuf *));
    26 void sbdrop _P((struct sbuf *, int));
    27 void sbreserve _P((struct sbuf *, int));
    28 void sbappend _P((PNATState, struct socket *, struct mbuf *));
    29 void sbappendsb _P((struct sbuf *, struct mbuf *));
    30 void sbcopy _P((struct sbuf *, int, int, char *));
     25void sbfree (struct sbuf *);
     26void sbdrop (struct sbuf *, int);
     27void sbreserve (struct sbuf *, int);
     28void sbappend (PNATState, struct socket *, struct mbuf *);
     29void sbappendsb (struct sbuf *, struct mbuf *);
     30void sbcopy (struct sbuf *, int, int, char *);
    3131
    3232#endif

  • TabularUnified trunk/src/VBox/Devices/Network/slirp/slirp.h

    r20301 r20306  
    156156#endif
    157157
    158 #ifndef _P
    159 #ifndef NO_PROTOTYPES
    160 #  define   _P(x)   x
    161 #else
    162 #  define   _P(x)   ()
    163 #endif
    164 #endif
    165 
    166158#ifndef RT_OS_WINDOWS
    167159# include <netinet/in.h>
    … …  
    174166
    175167#ifndef HAVE_INET_ATON
    176 int inet_aton _P((const char *cp, struct in_addr *ia));
     168int inet_aton (const char *cp, struct in_addr *ia);
    177169#endif
    178170
    … …  
    251243#endif
    252244
    253 void if_start _P((PNATState));
     245void if_start (PNATState);
    254246
    255247#ifndef HAVE_INDEX
    256  char *index _P((const char *, int));
     248 char *index (const char *, int);
    257249#endif
    258250
    259251#ifndef HAVE_GETHOSTID
    260  long gethostid _P((void));
     252 long gethostid (void);
    261253#endif
    262254
    … …  
    265257# define remque_32 remque
    266258#else
    267 extern void insque_32 _P((PNATState, void *, void *));
    268 extern void remque_32 _P((PNATState, void *));
     259extern void insque_32 (PNATState, void *, void *);
     260extern void remque_32 (PNATState, void *);
    269261#endif
    270262
    … …  
    285277
    286278/* if.c */
    287 void if_init _P((PNATState));
    288 void if_output _P((PNATState, struct socket *, struct mbuf *));
     279void if_init (PNATState);
     280void if_output (PNATState, struct socket *, struct mbuf *);
    289281
    290282/* ip_input.c */
    291 void ip_init _P((PNATState));
    292 void ip_input _P((PNATState, struct mbuf *));
    293 struct mbuf * ip_reass _P((PNATState, register struct mbuf *));
    294 void ip_freef _P((PNATState, struct ipqhead *, struct ipq_t *));
    295 void ip_slowtimo _P((PNATState));
    296 void ip_stripoptions _P((register struct mbuf *, struct mbuf *));
     283void ip_init (PNATState);
     284void ip_input (PNATState, struct mbuf *);
     285struct mbuf * ip_reass (PNATState, register struct mbuf *);
     286void ip_freef (PNATState, struct ipqhead *, struct ipq_t *);
     287void ip_slowtimo (PNATState);
     288void ip_stripoptions (register struct mbuf *, struct mbuf *);
    297289
    298290/* ip_output.c */
    299 int ip_output _P((PNATState, struct socket *, struct mbuf *));
     291int ip_output (PNATState, struct socket *, struct mbuf *);
    300292
    301293/* tcp_input.c */
    302 int tcp_reass _P((PNATState, struct tcpcb *, struct tcphdr *, int *, struct mbuf *));
    303 void tcp_input _P((PNATState, register struct mbuf *, int, struct socket *));
    304 void tcp_dooptions _P((PNATState, struct tcpcb *, u_char *, int, struct tcpiphdr *));
    305 void tcp_xmit_timer _P((PNATState, register struct tcpcb *, int));
    306 int tcp_mss _P((PNATState, register struct tcpcb *, u_int));
     294int tcp_reass (PNATState, struct tcpcb *, struct tcphdr *, int *, struct mbuf *);
     295void tcp_input (PNATState, register struct mbuf *, int, struct socket *);
     296void tcp_dooptions (PNATState, struct tcpcb *, u_char *, int, struct tcpiphdr *);
     297void tcp_xmit_timer (PNATState, register struct tcpcb *, int);
     298int tcp_mss (PNATState, register struct tcpcb *, u_int);
    307299
    308300/* tcp_output.c */
    309 int tcp_output _P((PNATState, register struct tcpcb *));
    310 void tcp_setpersist _P((register struct tcpcb *));
     301int tcp_output (PNATState, register struct tcpcb *);
     302void tcp_setpersist (register struct tcpcb *);
    311303
    312304/* tcp_subr.c */
    313 void tcp_init _P((PNATState));
    314 void tcp_template _P((struct tcpcb *));
    315 void tcp_respond _P((PNATState, struct tcpcb *, register struct tcpiphdr *, register struct mbuf *, tcp_seq, tcp_seq, int));
    316 struct tcpcb * tcp_newtcpcb _P((PNATState, struct socket *));
    317 struct tcpcb * tcp_close _P((PNATState, register struct tcpcb *));
    318 void tcp_drain _P((void));
    319 void tcp_sockclosed _P((PNATState, struct tcpcb *));
    320 int tcp_fconnect _P((PNATState, struct socket *));
    321 void tcp_connect _P((PNATState, struct socket *));
    322 int tcp_attach _P((PNATState, struct socket *));
    323 u_int8_t tcp_tos _P((struct socket *));
    324 int tcp_emu _P((PNATState, struct socket *, struct mbuf *));
    325 int tcp_ctl _P((PNATState, struct socket *));
     305void tcp_init (PNATState);
     306void tcp_template (struct tcpcb *);
     307void tcp_respond (PNATState, struct tcpcb *, register struct tcpiphdr *, register struct mbuf *, tcp_seq, tcp_seq, int);
     308struct tcpcb * tcp_newtcpcb (PNATState, struct socket *);
     309struct tcpcb * tcp_close (PNATState, register struct tcpcb *);
     310void tcp_drain (void);
     311void tcp_sockclosed (PNATState, struct tcpcb *);
     312int tcp_fconnect (PNATState, struct socket *);
     313void tcp_connect (PNATState, struct socket *);
     314int tcp_attach (PNATState, struct socket *);
     315u_int8_t tcp_tos (struct socket *);
     316int tcp_emu (PNATState, struct socket *, struct mbuf *);
     317int tcp_ctl (PNATState, struct socket *);
    326318struct tcpcb *tcp_drop(PNATState, struct tcpcb *tp, int err);
    327319

  • TabularUnified trunk/src/VBox/Devices/Network/slirp/slirp_config.h

    r15791 r20306  
    4040 */
    4141#undef USE_LOWCPU
    42 
    43 /* Define this if your compiler doesn't like prototypes */
    44 #ifndef __STDC__
    45 #define NO_PROTOTYPES
    46 #endif
    4742
    4843/*********************************************************/
    … …  
    127122#define const const
    128123
    129 /* Define if your compiler doesn't like prototypes */
    130 #undef NO_PROTOTYPES
    131 
    132124/* Define if you don't have u_int32_t etc. typedef'd */
    133125#undef NEED_TYPEDEFS

  • TabularUnified trunk/src/VBox/Devices/Network/slirp/socket.h

    r20164 r20306  
    154154#endif
    155155
    156 void so_init _P((void));
    157 struct socket * solookup _P((struct socket *, struct in_addr, u_int, struct in_addr, u_int));
    158 struct socket * socreate _P((void));
    159 void sofree _P((PNATState, struct socket *));
     156void so_init (void);
     157struct socket * solookup (struct socket *, struct in_addr, u_int, struct in_addr, u_int);
     158struct socket * socreate (void);
     159void sofree (PNATState, struct socket *);
    160160#ifdef VBOX_WITH_SLIRP_MT
    161161void soread_queue (PNATState, struct socket *, int *);
    162162#endif
    163 int soread _P((PNATState, struct socket *));
    164 void sorecvoob _P((PNATState, struct socket *));
    165 int sosendoob _P((struct socket *));
    166 int sowrite _P((PNATState, struct socket *));
    167 void sorecvfrom _P((PNATState, struct socket *));
    168 int sosendto _P((PNATState, struct socket *, struct mbuf *));
    169 struct socket * solisten _P((PNATState, u_int, u_int32_t, u_int, int));
    170 void sorwakeup _P((struct socket *));
    171 void sowwakeup _P((struct socket *));
    172 void soisfconnecting _P((register struct socket *));
    173 void soisfconnected _P((register struct socket *));
    174 void sofcantrcvmore _P((struct  socket *));
    175 void sofcantsendmore _P((struct socket *));
    176 void soisfdisconnected _P((struct socket *));
    177 void sofwdrain _P((struct socket *));
     163int soread (PNATState, struct socket *);
     164void sorecvoob (PNATState, struct socket *);
     165int sosendoob (struct socket *);
     166int sowrite (PNATState, struct socket *);
     167void sorecvfrom (PNATState, struct socket *);
     168int sosendto (PNATState, struct socket *, struct mbuf *);
     169struct socket * solisten (PNATState, u_int, u_int32_t, u_int, int);
     170void sorwakeup (struct socket *);
     171void sowwakeup (struct socket *);
     172void soisfconnecting (register struct socket *);
     173void soisfconnected (register struct socket *);
     174void sofcantrcvmore (struct  socket *);
     175void sofcantsendmore (struct socket *);
     176void soisfdisconnected (struct socket *);
     177void sofwdrain (struct socket *);
    178178
    179179#endif /* _SOCKET_H_ */

  • TabularUnified trunk/src/VBox/Devices/Network/slirp/tcp_timer.h

    r14964 r20306  
    130130struct tcpcb;
    131131
    132 void tcp_fasttimo _P((PNATState));
    133 void tcp_slowtimo _P((PNATState));
    134 void tcp_canceltimers _P((struct tcpcb *));
    135 struct tcpcb * tcp_timers _P((PNATState, register struct tcpcb *, int));
     132void tcp_fasttimo (PNATState);
     133void tcp_slowtimo (PNATState);
     134void tcp_canceltimers (struct tcpcb *);
     135struct tcpcb * tcp_timers (PNATState, register struct tcpcb *, int);
    136136
    137137#endif

  • TabularUnified trunk/src/VBox/Devices/Network/slirp/udp.h

    r17056 r20306  
    102102struct mbuf;
    103103
    104 void udp_init _P((PNATState));
    105 void udp_input _P((PNATState, register struct mbuf *, int));
    106 int udp_output _P((PNATState, struct socket *, struct mbuf *, struct sockaddr_in *));
    107 int udp_attach _P((PNATState, struct socket *, int service_port));
    108 void udp_detach _P((PNATState, struct socket *));
    109 u_int8_t udp_tos _P((struct socket *));
    110 void udp_emu _P((PNATState, struct socket *, struct mbuf *));
    111 struct socket * udp_listen _P((PNATState, u_int, u_int32_t, u_int, int));
     104void udp_init (PNATState);
     105void udp_input (PNATState, register struct mbuf *, int);
     106int udp_output (PNATState, struct socket *, struct mbuf *, struct sockaddr_in *);
     107int udp_attach (PNATState, struct socket *, int service_port);
     108void udp_detach (PNATState, struct socket *);
     109u_int8_t udp_tos (struct socket *);
     110void udp_emu (PNATState, struct socket *, struct mbuf *);
     111struct socket * udp_listen (PNATState, u_int, u_int32_t, u_int, int);
    112112int udp_output2(PNATState pData, struct socket *so, struct mbuf *m,
    113113                struct sockaddr_in *saddr, struct sockaddr_in *daddr,
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette