Commit 0007fb16cd2bb0fdb3a67ec5640b8802fd854478
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.
Network/.sender.c.swp deleted
No preview for this file type
@@ -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/ChmodBPF/StartupParameters.plist
100644 → 100755
Network/libpcap-1.9.0/Win32/Prj/wpcap.vcxproj.filters
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/doc/DLT_ALLOCATE_HOWTO.md
100644 → 100755
Network/libpcap-1.9.0/org.tcpdump.chmod_bpf.plist
100644 → 100755