Merge branch 'automake'

Conflicts:
	crude/main.c
	include/rude.h
	rude/parse.c

.gitignore

+*.o
+crude/crude
+rude/rude
+
+autom4te.cache/
+autoconf/config.hin
+configure
+crude/Makefile
+include/config.h
+include/stamp.h
+rude/Makefile
+Makefile
+

DOC/README

@@ -39,6 +39,11 @@ INTRODUCTION (very short):
 COMPILATION AND INSTALLATION INSTRUCTIONS:
 ------------------------------------------
 
+ In order to compile this software, you need a compiler.  How you can
+ obtain a compiler depends on your operating system.  on Debian,
+ for example, you need to run
+ `apt-get install build-essential git automake autoconf`.
+
  1. This package you have received should contain the automatic 'configure'
     script in the source code root directory. If this is true you can jump
     into the step 4. Otherwise read also the steps 2. and 3. that explain
@@ -49,22 +54,22 @@ COMPILATION AND INSTALLATION INSTRUCTIONS:
  2. So you have the very clean version. Alright. Before you can compile
     the program you should make the configuration script(s) and other
     files with the GNU autoconf utilities. In other words you require
-    properly installed 'autoheader' and 'autoconf' programs. At least
+    properly installed `autoheader` and `autoconf` programs. At least
     version 2.13 of the GNU autoconf tools seems to work fine.
     [ After those programs are installed you can move on.... ]
 
 
  3. You need to generate some header file(s) and the configuration script
-    with the following commands (you must be in the program's source code
-    root directory):
+    with the following commands (you must be in the project's root
+    directory, right outside the DOC folder):
 
-	autoheader -l ./autoconf
+	autoheader autoconf/configure.in
 	autoconf autoconf/configure.in > configure
 	chmod 755 configure
 
 
  4. Now you are ready to go on and configure this software package. As
-    usual, you can say './configure --help' to get the full list of
+    usual, you can say `./configure --help` to get the full list of
     configuring switches. Here are only the usually required options:
 
 	--prefix=PREFIX         = Installation directory root (/usr/local/)
@@ -77,9 +82,14 @@ COMPILATION AND INSTALLATION INSTRUCTIONS:
 
 	./configure --enable-wall --with-debug-lvl=3
 
+  The configure command will give a warning about ignoring
+  --datarootdir setting.  You can safely ignore this warning.
+
 
  5. 'make all'
 
+    This command will create the executables
+    `rude/rude` and `crude/crude`.
     So far this program is tested on Linux and Solaris2.6 OS's and
     seems to compile/operate without any major drawbacks. Your mileage
     may vary...
@@ -87,6 +97,7 @@ COMPILATION AND INSTALLATION INSTRUCTIONS:
 
  6. 'make install'
 
+    This command will install the executables on the filesystem.
     USE MANUAL INSTALLATION IF THIS FAILS. SORRY 'BOUT THAT :)
     Only ROOT can successfully execute this command.
 

DOC/example.cfg

@@ -22,10 +22,20 @@ START NOW
 ##   1000 packets/second with 1000 bytes/packet = 1000kbytes/sec
 ##
 ## 1 second from that the flow is turned off...
-##
-1000 0030 ON 3002 10.1.1.1:10001 CONSTANT 200 250
-3000 0030 MODIFY CONSTANT 400 500
-4000 0030 MODIFY CONSTANT 1000 1000
+
+1000 0030 ON 1030 192.168.1.1:1031 CONSTANT 200 250
+#2000 0030 MODIFY CONSTANT 400 500
+#4000 0030 MODIFY CONSTANT 1000 1000
+
+# IPv4 multicast address
+#1000 0030 ON 1030 224.0.2.123:1031 CONSTANT 10 256
+
+# IPv6 unicast address
+#1000 0030 ON 1030 2001:718:1:b:21f:d0ff:feae:64b2:1031 CONSTANT 10 512
+
+# ipv6 multicast address
+#1000 0030 ON 1030 FF3E:040:2001:718:2:981:ACAC:ACCA:1031 CONSTANT 10 1024
+
 5000 0030 OFF
 
 ## FLOW 2: (flow ID = 25)
@@ -36,16 +46,16 @@ START NOW
 ## Sets the TOS for this flow to LOW_DELAY (0x10)
 ##
 ## 9 seconds after that the flow is turned off...
-##
-0000 0025 ON 3001 10.1.1.1:10001 CONSTANT 400 100
-TOS 0025 0x10
-9000 0025 OFF
+#
+#0000 0025 ON 1025 hostname.domain.com:1026 CONSTANT 400 100
+#TOS 0025 0x10
+#9000 0025 OFF
 
 ## FLOW 3: (flow ID = 1)
 ##
 ## This flow acts as specified in the TRACE configuration file.
 ## Read the README.rude file for the command and file syntax
 ##
-0000 1 ON 3111 10.1.1.1:10001 TRACE trace_file.txt
-9999 1 OFF
+#0000 1 ON 1001 10.1.1.1:1002 TRACE trace_file.txt
+#9999 1 OFF
 ## ... and that's it.

autoconf/Makefile.in

-# $Id$
+# $Id: Makefile.in,v 1.1 2005/05/31 07:12:38 ubik Exp $
 #
 # autoconf/Makefile.in - the main Makefile template for RUDE and CRUDE
 #

autoconf/configure.in

-# $Id$
+# $Id: configure.in,v 1.1 2005/05/31 07:12:38 ubik Exp $
 #
 # autoconf/configure.in for RUDE and CRUDE
 #

crude/Makefile.in

-# $Id$
+# $Id: Makefile.in,v 1.2 2005/06/30 12:02:49 juranek Exp $
 #
 # Makefile.in for CRUDE
 #
@@ -29,7 +29,7 @@ DEFS     = @DEFS@
 LIBS     = @LIBS@
 MAN8     = crude.8
 
-CRUDE_OBJS = main.o
+CRUDE_OBJS = main.o ../rude/mcast.o
 
 ##############################################################################
 # Rules for make

include/mcast.c

+/*
+*  C Implementation: %{$MODULE}
+*
+* Description:
+*
+*
+*
+* Copyright: See COPYING file that comes with this distribution
+*
+*/
+#include <mcast.h>
+#include <rude.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <time.h>
+#include <net/if.h>
+#include <sys/ioctl.h>
+
+int
+isMulticastAddr(struct sockaddr_storage *addr)
+{
+    int retVal;
+
+    retVal=-1;
+		
+    switch (addr->ss_family) {
+        case AF_INET: {
+            struct sockaddr_in *addr4=(struct sockaddr_in *)addr;
+            retVal = IN_MULTICAST(ntohl(addr4->sin_addr.s_addr));
+        } break;
+
+        case AF_INET6: {
+            struct sockaddr_in6 *addr6=(struct sockaddr_in6 *)addr;
+ 					retVal = IN6_IS_ADDR_MULTICAST(&addr6->sin6_addr);
+        } break;
+
+        default:
+           ;
+    }
+
+    return retVal;
+} 
+
+
+
+
+int joinGroup(int sockfd, int loopBack, unsigned int mcastTTL,struct sockaddr_storage *addr,int interface)
+{
+    int r1, r2, r3, retval;
+
+    retval=-1;
+    switch (addr->ss_family) {
+        case AF_INET: {
+		        struct ip_mreq      mreq;
+			//zjistit adresu interfacu(v parametru je jeho index),INADDR_ANY je pro defaultni
+            mreq.imr_multiaddr.s_addr=
+                ((struct sockaddr_in *)addr)->sin_addr.s_addr;
+			if(interface < 0){
+            	mreq.imr_interface.s_addr= INADDR_ANY;
+				RUDEBUG7("joinGroup: using inaddr_any interface\n");
+			}
+			else{
+				struct ifreq ifr;
+				char name[IF_NAMESIZE];
+				RUDEBUG7("joinGroup: using interface %i\n",interface);
+				if(!if_indextoname(interface,name)){
+					RUDEBUG1("joinGroup: interface doesnt exist.\n");
+					return retval;
+				}
+				
+				strcpy(ifr.ifr_name, name);
+				if(ioctl(sockfd,SIOCGIFADDR,&ifr)==-1){
+					RUDEBUG1("joinGroup() - ioctl failed for getting interface address: %s\n",strerror(errno));
+					return retval;
+				}
+				struct sockaddr_in *si = (struct sockaddr_in*)&ifr.ifr_addr;
+				RUDEBUG7("joinGroup(): interface address: %s\n",inet_ntoa(si->sin_addr));
+				//mreq.imr_interface.s_addr = si->sin_addr.s_addr;
+				memcpy(&mreq.imr_interface,&(si->sin_addr),sizeof(struct in_addr));
+				
+				//mreq.imr_interface = si->sin_addr;
+			}
+
+            r1= setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_LOOP,
+                           &loopBack, sizeof(loopBack));
+            if (r1<0)
+                RUDEBUG1("joinGroup:: IP_MULTICAST_LOOP:: ");
+
+            r2= setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL,
+                           &mcastTTL, sizeof(mcastTTL));
+            if (r2<0)
+               RUDEBUG1("joinGroup:: IP_MULTICAST_TTL:: ");
+
+            r3= setsockopt(sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+                           (const void *)&mreq, sizeof(mreq));
+            if (r3<0)
+                RUDEBUG1("joinGroup:: IP_ADD_MEMBERSHIP:: ");
+
+        } break;
+
+        case AF_INET6: {
+           struct ipv6_mreq    mreq6;
+
+           memcpy(&mreq6.ipv6mr_multiaddr,
+                  &(((struct sockaddr_in6 *)addr)->sin6_addr),
+                  sizeof(struct in6_addr));
+			
+		   if(interface < 0){
+            	mreq6.ipv6mr_interface= 0;
+				RUDEBUG7("joinGroup: using default interface\n");
+		   }else{
+            	mreq6.ipv6mr_interface= interface;
+				RUDEBUG7("joinGroup: using interface with index: %d\n",interface);
+		   }			   
+            
+
+	   	   r1= setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, 
+                          &loopBack, sizeof(loopBack));
+           if (r1<0)
+               RUDEBUG1("joinGroup(): IPV6_MULTICAST_LOOP error");
+
+           r2= setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, 
+                          &mcastTTL, sizeof(mcastTTL));
+           if (r2<0)
+               RUDEBUG1("joinGroup() IPV6_MULTICAST_HOPS error  ");
+
+		   r3=setsockopt(sockfd,IPPROTO_IPV6,IPV6_JOIN_GROUP,&mreq6,sizeof(mreq6));
+			//r3=setsockopt(sockfd,IPPROTO_IPV6,IP_ADD_MEMBERSHIP,&mreq6,sizeof(mreq6));		   
+			 if (r3<0)
+              RUDEBUG1("joinGroup() IPV6_JOIN_GROUP error ");
+
+        } break;
+
+        default:
+            r1=r2=r3=-1;
+    }
+
+    if ((r1>=0) && (r2>=0) && (r3>=0))
+        retval=0;
+
+    return retval;
+}

include/mcast.h

+//
+// C++ Interface: %{MODULE}
+//
+// Description: 
+//
+//
+// Author: %{AUTHOR} <%{EMAIL}>, (C) %{YEAR}
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+//
+
+#include <netinet/in.h>  /* for struct sockaddr_in */
+
+int isMulticastAddr(struct sockaddr_storage *addr);
+int joinGroup(int sockfd, int loopBack, unsigned int mcastTTL,struct sockaddr_storage *addr,int interface);

rude/Makefile.in

-# $Id$
+# $Id: Makefile.in,v 1.2 2005/06/30 12:02:49 juranek Exp $
 #
 # Makefile.in for RUDE
 #
@@ -29,7 +29,7 @@ DEFS     = @DEFS@
 LIBS     = @LIBS@
 MAN8     = rude.8
 
-RUDE_OBJS = flow_cntl.o flow_txmit.o main.o parse.o
+RUDE_OBJS = flow_cntl.o flow_txmit.o main.o parse.o mcast.o
 
 ##############################################################################
 # Rules for make

scripts/crude_jitter.pl

-#!/usr/local/bin/perl
+#!/usr/bin/perl
 ###############################################################################
 #    crude_jitter.pl - refines the output from CRUDE.
 #