[netperf-dev] netperf2 commit notice r325 - trunk/src

[raj at netperf.org]

Author: raj
Date: 2009-09-28 10:36:33 -0700 (Mon, 28 Sep 2009)
New Revision: 325

Modified:
   trunk/src/nettest_sctp.c
   trunk/src/nettest_sctp.h
Log:
prototypes for sctp from jose

Modified: trunk/src/nettest_sctp.c
===================================================================
--- trunk/src/nettest_sctp.c	2009-09-28 17:30:51 UTC (rev 324)
+++ trunk/src/nettest_sctp.c	2009-09-28 17:36:33 UTC (rev 325)
@@ -147,12 +147,10 @@
  /* called outside of the timing loop */
 static
 void
-get_sctp_info(socket, mss)
-     int socket;
-     int *mss;
+get_sctp_info( int socket, int *mss )
 {
 
-  int sock_opt_len;
+  socklen_t sock_opt_len;
 
   if (sctp_opt_info(socket,
 		    0,
@@ -166,9 +164,7 @@
 
 static
 void
-sctp_enable_events(socket, ev_mask)
-    int socket;
-    int ev_mask;
+sctp_enable_events( int socket, int ev_mask )
 {
     struct sctp_event_subscribe ev;
 
@@ -222,9 +218,7 @@
 
 static
 sctp_disposition_t
-sctp_process_event(socket, buf)
-    int socket;
-    void *buf;
+sctp_process_event( int socket, void *buf )
 {
 
     struct sctp_assoc_change *sac;
@@ -322,8 +316,7 @@
 
 
 void 
-send_sctp_stream(remote_host)
-char	remote_host[];
+send_sctp_stream( char remote_host[] )
 {
   
   char *tput_title = "\
@@ -1056,13 +1049,13 @@
 /* didn't feel it was necessary. */
 
 void
-recv_sctp_stream()
+recv_sctp_stream( void )
 {
   
   struct sockaddr_in myaddr_in; /* needed to get port number */
   struct sockaddr_storage peeraddr;	/* used in accept */
   int	s_listen,s_data;
-  int 	addrlen;
+  socklen_t 	addrlen;
   int	len;
   unsigned int	receive_calls;
   float	elapsed_time;
@@ -1456,8 +1449,7 @@
 
 
 void 
-send_sctp_stream_1toMany(remote_host)
-char	remote_host[];
+send_sctp_stream_1toMany( char remote_host[] )
 {
   
   char *tput_title = "\
@@ -2215,12 +2207,12 @@
 /* didn't feel it was necessary. */
 
 void
-recv_sctp_stream_1toMany()
+recv_sctp_stream_1toMany( void )
 {
   
   struct sockaddr_in myaddr_in;
   int	s_recv;
-  int 	addrlen;
+  socklen_t 	addrlen;
   int	len;
   unsigned int	receive_calls;
   float	elapsed_time;
@@ -2569,8 +2561,7 @@
  /* test. */
 
 void
-send_sctp_rr(remote_host)
-     char	remote_host[];
+send_sctp_rr( char remote_host[] )
 {
   
   char *tput_title = "\
@@ -3248,7 +3239,7 @@
  /* this routine implements the receive (netserver) side of a TCP_RR */
  /* test */
 void
-recv_sctp_rr()
+recv_sctp_rr( void )
 {
   
   struct ring_elt *send_ring;
@@ -3260,7 +3251,7 @@
 
   struct sockaddr_in        myaddr_in, peeraddr_in;
   int	s_listen, s_data;
-  int 	addrlen;
+  socklen_t 	addrlen;
   char	*temp_message_ptr;
   int	trans_received;
   int	trans_remaining;
@@ -3621,8 +3612,7 @@
    SCTP_RR_1TOMANY test */
 
 void
-send_sctp_rr_1toMany(remote_host)
-     char	remote_host[];
+send_sctp_rr_1toMany( char remote_host[] )
 {
   
   char *tput_title = "\
@@ -4299,7 +4289,7 @@
  /* this routine implements the receive (netserver) side of a TCP_RR */
  /* test */
 void
-recv_sctp_rr_1toMany()
+recv_sctp_rr_1toMany( void )
 {
   
   struct ring_elt *send_ring;
@@ -4314,7 +4304,7 @@
   int    msg_flags;
 
   int	s_rcv;
-  int 	addrlen;
+  socklen_t 	addrlen;
   int	trans_received;
   int	trans_remaining;
   int	bytes_sent;
@@ -4665,18 +4655,16 @@
 
 
 void
-print_sctp_usage()
+print_sctp_usage( void )
 {
 
   printf("%s",sctp_usage);
   exit(1);
 
 }
-void
-scan_sctp_args(argc, argv)
-     int	argc;
-     char	*argv[];
 
+void
+scan_sctp_args( int	argc, char *argv[] )
 {
 
 #define SOCKETS_ARGS "BDhH:I:L:m:M:P:r:s:S:VN:T:46"

Modified: trunk/src/nettest_sctp.h
===================================================================
--- trunk/src/nettest_sctp.h	2009-09-28 17:30:51 UTC (rev 324)
+++ trunk/src/nettest_sctp.h	2009-09-28 17:36:33 UTC (rev 325)
@@ -118,14 +118,15 @@
     SCTP_CLOSE,
 } sctp_disposition_t;
 
-extern void send_sctp_stream();
-extern void send_sctp_stream_1toMany(char remote_host[]);
-extern void send_sctp_rr();
+extern void send_sctp_stream( char remote_host[] );
+extern void send_sctp_stream_1toMany( char remote_host[] );
+extern void send_sctp_rr( char remote_host[] );
+extern void send_sctp_rr_1toMany( char remote_host[] );
 
-extern void recv_sctp_stream();
-extern void recv_sctp_stream_1toMany();
-extern void recv_sctp_rr();
-extern void recv_sctp_rr_1toMany();
+extern void recv_sctp_stream( void );
+extern void recv_sctp_stream_1toMany( void );
+extern void recv_sctp_rr( void );
+extern void recv_sctp_rr_1toMany( void );
 
 extern void loc_cpu_rate();
 extern void rem_cpu_rate();