Commit 0007fb16cd2bb0fdb3a67ec5640b8802fd854478

Authored by pifou
2 parents bb11e508 c9ce1fd2

Merge branch 'master' of https://archives.plil.fr/amoreau/skam_projet

Showing 306 changed files with 369 additions and 148 deletions   Show diff stats

Too many changes.

To preserve performance only 100 of 306 files are displayed.

Makefile 100644 → 100755
Network/.sender.c.swp deleted
No preview for this file type
Network/Makefile 100644 → 100755
@@ -2,29 +2,44 @@ @@ -2,29 +2,44 @@
2 # Makefile pour generer la bibliotheque de fonctions de communication 2 # Makefile pour generer la bibliotheque de fonctions de communication
3 # 3 #
4 4
5 -all : sniffer sender 5 +CC=gcc
  6 +CFLAGS=-W -Wall -Wextra
  7 +CLIBS=ar -rcs
  8 +LIB=libnet.a
  9 +LDIR=../libs/
  10 +LIBS=$(LDIR)libnet.a $(LDIR)libthrd.a
  11 +IDIR=../includes/
  12 +LDFLAGS=-lpthread -lpcap
6 13
7 -sniffer: sniffer.c  
8 - gcc -o sniffer sniffer.c -lpcap  
9 14
10 -sender: sender.c  
11 - gcc -o sender sender.c  
12 15
13 -#all: libnet.a 16 +all: $(LIB)
14 17
15 -#  
16 -# La cible de nettoyage  
17 -# 18 +$(LIB): sender.o sniffer.o tcpserver.o
  19 + rm -f $@
  20 + $(CLIBS) $(LDIR)$@ $^
  21 +<<<<<<< HEAD
  22 + ranlib $(LDIR)$@
  23 + rm -f *.o
  24 +=======
  25 + ranlib $(LDIR)$@
  26 +>>>>>>> 52d8a1eaf954b611aaf0861144b440a15f7c517d
  27 +
  28 +
  29 +tcpserver.o: tcpserver.c
  30 + $(CC) -o $@ -c $^ -I$(IDIR) $(CFLAGS)
  31 +
  32 +sniffer.o: sniffer.c
  33 + $(CC) -o $@ -c $^ $(CFLAGS)
  34 +
  35 +sender.o: sender.c
  36 + $(CC) -o $@ -c $^ $(CFLAGS)
18 37
19 -#clean:  
20 -# rm -f core *.o libnet.a  
21 38
22 # 39 #
23 -# Les cibles pour la bibliotheque 40 +# La cible de nettoyage
24 # 41 #
25 42
26 -#libnet.o: libnet.c libnet.h 43 +clean:
  44 + rm -f *.o $(LDIR)$(LIB) ../bin/test
27 45
28 -#libcom.a: libnet.o  
29 -# rm -f $@  
30 -# $(CLIB) $@ $+  
Network/libpcap-1.9.0/CHANGES 100644 → 100755
Network/libpcap-1.9.0/CMakeLists.txt 100644 → 100755
Network/libpcap-1.9.0/CONTRIBUTING.md 100644 → 100755
Network/libpcap-1.9.0/CREDITS 100644 → 100755
Network/libpcap-1.9.0/ChmodBPF/StartupParameters.plist 100644 → 100755
Network/libpcap-1.9.0/INSTALL.md 100644 → 100755
Network/libpcap-1.9.0/LICENSE 100644 → 100755
Network/libpcap-1.9.0/Makefile-devel-adds 100644 → 100755
Network/libpcap-1.9.0/Makefile.in 100644 → 100755
Network/libpcap-1.9.0/README.md 100644 → 100755
Network/libpcap-1.9.0/TODO 100644 → 100755
Network/libpcap-1.9.0/VERSION 100644 → 100755
Network/libpcap-1.9.0/Win32/Prj/wpcap.sln 100644 → 100755
Network/libpcap-1.9.0/Win32/Prj/wpcap.vcxproj 100644 → 100755
Network/libpcap-1.9.0/Win32/Prj/wpcap.vcxproj.filters 100644 → 100755
Network/libpcap-1.9.0/aclocal.m4 100644 → 100755
Network/libpcap-1.9.0/arcnet.h 100644 → 100755
Network/libpcap-1.9.0/atmuni31.h 100644 → 100755
Network/libpcap-1.9.0/bpf_dump.c 100644 → 100755
Network/libpcap-1.9.0/bpf_filter.c 100644 → 100755
Network/libpcap-1.9.0/bpf_image.c 100644 → 100755
Network/libpcap-1.9.0/cmake/Modules/FindDAG.cmake 100644 → 100755
Network/libpcap-1.9.0/cmake/Modules/FindFseeko.cmake 100644 → 100755
Network/libpcap-1.9.0/cmake/Modules/FindLFS.cmake 100644 → 100755
Network/libpcap-1.9.0/cmake/Modules/FindPacket.cmake 100644 → 100755
Network/libpcap-1.9.0/cmake/Modules/FindSNF.cmake 100644 → 100755
Network/libpcap-1.9.0/cmake/Modules/FindTC.cmake 100644 → 100755
Network/libpcap-1.9.0/cmake/have_siocglifconf.c 100644 → 100755
Network/libpcap-1.9.0/cmake_uninstall.cmake.in 100644 → 100755
Network/libpcap-1.9.0/cmakeconfig.h.in 100644 → 100755
Network/libpcap-1.9.0/config.h.in 100644 → 100755
Network/libpcap-1.9.0/configure.ac 100644 → 100755
Network/libpcap-1.9.0/diag-control.h 100644 → 100755
Network/libpcap-1.9.0/dlpisubs.c 100644 → 100755
Network/libpcap-1.9.0/dlpisubs.h 100644 → 100755
Network/libpcap-1.9.0/doc/DLT_ALLOCATE_HOWTO.md 100644 → 100755
Network/libpcap-1.9.0/doc/README.Win32 100644 → 100755
Network/libpcap-1.9.0/doc/README.aix 100644 → 100755
Network/libpcap-1.9.0/doc/README.dag 100644 → 100755
Network/libpcap-1.9.0/doc/README.hpux 100644 → 100755
Network/libpcap-1.9.0/doc/README.linux.md 100644 → 100755
Network/libpcap-1.9.0/doc/README.macos 100644 → 100755
Network/libpcap-1.9.0/doc/README.septel 100644 → 100755
Network/libpcap-1.9.0/doc/README.sita 100644 → 100755
Network/libpcap-1.9.0/doc/README.tru64 100644 → 100755
Network/libpcap-1.9.0/etherent.c 100644 → 100755
Network/libpcap-1.9.0/ethertype.h 100644 → 100755
Network/libpcap-1.9.0/extract.h 100644 → 100755
Network/libpcap-1.9.0/fad-getad.c 100644 → 100755
Network/libpcap-1.9.0/fad-gifc.c 100644 → 100755
Network/libpcap-1.9.0/fad-glifc.c 100644 → 100755
Network/libpcap-1.9.0/fmtutils.c 100644 → 100755
Network/libpcap-1.9.0/fmtutils.h 100644 → 100755
Network/libpcap-1.9.0/ftmacros.h 100644 → 100755
Network/libpcap-1.9.0/gencode.c 100644 → 100755
Network/libpcap-1.9.0/gencode.h 100644 → 100755
Network/libpcap-1.9.0/grammar.y 100644 → 100755
Network/libpcap-1.9.0/ieee80211.h 100644 → 100755
Network/libpcap-1.9.0/lbl/os-aix4.h 100644 → 100755
Network/libpcap-1.9.0/lbl/os-aix7.h 100644 → 100755
Network/libpcap-1.9.0/lbl/os-hpux11.h 100644 → 100755
Network/libpcap-1.9.0/lbl/os-osf4.h 100644 → 100755
Network/libpcap-1.9.0/lbl/os-osf5.h 100644 → 100755
Network/libpcap-1.9.0/lbl/os-solaris2.h 100644 → 100755
Network/libpcap-1.9.0/lbl/os-sunos4.h 100644 → 100755
Network/libpcap-1.9.0/lbl/os-ultrix4.h 100644 → 100755
Network/libpcap-1.9.0/libpcap.pc.in 100644 → 100755
Network/libpcap-1.9.0/llc.h 100644 → 100755
Network/libpcap-1.9.0/missing/getopt.c 100644 → 100755
Network/libpcap-1.9.0/missing/getopt.h 100644 → 100755
Network/libpcap-1.9.0/missing/snprintf.c 100644 → 100755
Network/libpcap-1.9.0/missing/strtok_r.c 100644 → 100755
Network/libpcap-1.9.0/missing/win_snprintf.c 100644 → 100755
Network/libpcap-1.9.0/msdos/bin2c.c 100644 → 100755
Network/libpcap-1.9.0/msdos/makefile 100644 → 100755
Network/libpcap-1.9.0/msdos/makefile.dj 100644 → 100755
Network/libpcap-1.9.0/msdos/makefile.wc 100644 → 100755
Network/libpcap-1.9.0/msdos/pkt_rx0.asm 100644 → 100755
Network/libpcap-1.9.0/msdos/pkt_rx1.s 100644 → 100755
Network/libpcap-1.9.0/msdos/pktdrvr.c 100644 → 100755
Network/libpcap-1.9.0/msdos/pktdrvr.h 100644 → 100755
Network/libpcap-1.9.0/msdos/readme.dos 100644 → 100755
Network/libpcap-1.9.0/nametoaddr.c 100644 → 100755
Network/libpcap-1.9.0/nametoaddr.h 100644 → 100755
Network/libpcap-1.9.0/nlpid.h 100644 → 100755
Network/libpcap-1.9.0/optimize.c 100644 → 100755
Network/libpcap-1.9.0/optimize.h 100644 → 100755
Network/libpcap-1.9.0/org.tcpdump.chmod_bpf.plist 100644 → 100755
Network/libpcap-1.9.0/pcap-bpf.c 100644 → 100755
Network/libpcap-1.9.0/pcap-bpf.h 100644 → 100755
Network/libpcap-1.9.0/pcap-bt-linux.c 100644 → 100755
Network/libpcap-1.9.0/pcap-bt-linux.h 100644 → 100755
Network/libpcap-1.9.0/pcap-bt-monitor-linux.c 100644 → 100755
Network/libpcap-1.9.0/pcap-bt-monitor-linux.h 100644 → 100755
Network/libpcap-1.9.0/pcap-common.c 100644 → 100755
Network/libpcap-1.9.0/pcap-common.h 100644 → 100755
Network/libpcap-1.9.0/pcap-config.1 100644 → 100755