Se generaliza el devque para seguir (ab)usándolo como cola y poder pedir de

[z.facultad/75.74/practicos.git] / practicas / pipi / src / Makefile

diff --git a/practicas/pipi/src/Makefile b/practicas/pipi/src/Makefile
index b3e071ce1b493bcb8b1f89bb4844fceb39a7774f..f76f0e2053039a5035b5d75b22a49e088740df38 100644 (file)
--- a/practicas/pipi/src/Makefile
+++ b/practicas/pipi/src/Makefile
@@ -32,11 +32,15 @@ CC=g++
 # Programas
 targets=ip
 tests=test_send test_recv test_ipaddr test_ipin test_ipout test_devtcp \
 # Programas
 targets=ip
 tests=test_send test_recv test_ipaddr test_ipin test_ipout test_devtcp \

-      test_poll test_resolvprotos test_resolvprotoc
+      test_poll test_resolvproto test_nameserver_file \
+      test_nameserver_resolvnext

 
 # Fuentes
 fuentes ?= $(wildcard *.cpp) $(wildcard *.c)
 
 
 # Fuentes
 fuentes ?= $(wildcard *.cpp) $(wildcard *.c)
 

+ip_objs=ipout.o ipin.o ipaddr.o ipheader.o devque.o devtcp.o routetable.o \
+       libtcp.o
+dns_objs=nameserver.o resolvproto.o

 
 # REGLAS
 #########
 
 # REGLAS
 #########


@@ -61,11 +65,14 @@ test_devtcp: test_devtcp.o devtcp.o libtcp.o ipaddr.o
 
 test_poll: test_poll.o libtcp.o
 
 
 test_poll: test_poll.o libtcp.o
 

-test_resolvprotos: test_resolvprotos.o libtcp.o ipaddr.o resolvproto.o
+test_resolvproto: test_resolvproto.o resolvproto.o ipaddr.o

 
 

-test_resolvprotoc: test_resolvprotoc.o libtcp.o ipaddr.o resolvproto.o
+test_nameserver_file: test_nameserver_file.o $(dns_objs) $(ip_objs)

 
 

-ip: ip.o ipout.o ipin.o ipaddr.o ipheader.o devque.o devtcp.o routetable.o libtcp.o
+#FIXME no va libtcp.o, debe ir sobre mi implementación de ip.
+test_nameserver_resolvnext: test_nameserver_resolvnext.o $(dns_objs) $(ip_objs)
+
+ip: ip.o $(ip_objs)

 
 depend:
        @makedepend $(fuentes) > /dev/null 2>&1
 
 depend:
        @makedepend $(fuentes) > /dev/null 2>&1


@@ -127,6 +134,29 @@ devtcp.o: /usr/include/bits/netdb.h /usr/include/fcntl.h
 devtcp.o: /usr/include/bits/fcntl.h /usr/include/sys/ipc.h
 devtcp.o: /usr/include/bits/ipctypes.h /usr/include/bits/ipc.h
 devtcp.o: /usr/include/sys/msg.h /usr/include/bits/msq.h
 devtcp.o: /usr/include/bits/fcntl.h /usr/include/sys/ipc.h
 devtcp.o: /usr/include/bits/ipctypes.h /usr/include/bits/ipc.h
 devtcp.o: /usr/include/sys/msg.h /usr/include/bits/msq.h

+dns.o: ipout.h ipaddr.h /usr/include/stdint.h /usr/include/features.h
+dns.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
+dns.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h ipheader.h
+dns.o: routetable.h dev.h ipin.h devtcp.h /usr/include/sys/poll.h
+dns.o: /usr/include/bits/poll.h devque.h /usr/include/unistd.h
+dns.o: /usr/include/bits/posix_opt.h /usr/include/bits/types.h
+dns.o: /usr/include/bits/typesizes.h /usr/include/bits/confname.h
+dns.o: /usr/include/getopt.h /usr/include/fcntl.h /usr/include/bits/fcntl.h
+dns.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h
+dns.o: /usr/include/bits/endian.h /usr/include/sys/select.h
+dns.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+dns.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
+dns.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
+dns.o: /usr/include/sys/wait.h /usr/include/signal.h
+dns.o: /usr/include/bits/signum.h /usr/include/bits/siginfo.h
+dns.o: /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h
+dns.o: /usr/include/asm/sigcontext.h /usr/include/asm-i486/sigcontext.h
+dns.o: /usr/include/linux/compiler.h /usr/include/bits/sigstack.h
+dns.o: /usr/include/bits/sigthread.h /usr/include/sys/resource.h
+dns.o: /usr/include/bits/resource.h /usr/include/bits/waitflags.h
+dns.o: /usr/include/bits/waitstatus.h /usr/include/sys/ipc.h
+dns.o: /usr/include/bits/ipctypes.h /usr/include/bits/ipc.h
+dns.o: /usr/include/sys/msg.h /usr/include/bits/msq.h

 ip.o: ipout.h ipaddr.h /usr/include/stdint.h /usr/include/features.h
 ip.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
 ip.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h ipheader.h
 ip.o: ipout.h ipaddr.h /usr/include/stdint.h /usr/include/features.h
 ip.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
 ip.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h ipheader.h


@@ -175,42 +205,16 @@ ipout.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
 ipout.o: /usr/include/sys/ipc.h /usr/include/bits/ipctypes.h
 ipout.o: /usr/include/bits/ipc.h /usr/include/sys/msg.h
 ipout.o: /usr/include/bits/msq.h
 ipout.o: /usr/include/sys/ipc.h /usr/include/bits/ipctypes.h
 ipout.o: /usr/include/bits/ipc.h /usr/include/sys/msg.h
 ipout.o: /usr/include/bits/msq.h

+nameserver.o: nameserver.h devque.h dev.h ipaddr.h /usr/include/stdint.h
+nameserver.o: /usr/include/features.h /usr/include/sys/cdefs.h
+nameserver.o: /usr/include/gnu/stubs.h /usr/include/bits/wchar.h
+nameserver.o: /usr/include/bits/wordsize.h resolvproto.h ipin.h ipheader.h
+nameserver.o: ipout.h routetable.h

 resolvproto.o: resolvproto.h ipaddr.h /usr/include/stdint.h
 resolvproto.o: /usr/include/features.h /usr/include/sys/cdefs.h
 resolvproto.o: /usr/include/gnu/stubs.h /usr/include/bits/wchar.h
 resolvproto.o: resolvproto.h ipaddr.h /usr/include/stdint.h
 resolvproto.o: /usr/include/features.h /usr/include/sys/cdefs.h
 resolvproto.o: /usr/include/gnu/stubs.h /usr/include/bits/wchar.h

-resolvproto.o: /usr/include/bits/wordsize.h libtcp.h /usr/include/stdio.h
-resolvproto.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
-resolvproto.o: /usr/include/libio.h /usr/include/_G_config.h
-resolvproto.o: /usr/include/wchar.h /usr/include/gconv.h
-resolvproto.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h
-resolvproto.o: /usr/include/stdlib.h /usr/include/sys/types.h
-resolvproto.o: /usr/include/time.h /usr/include/endian.h
-resolvproto.o: /usr/include/bits/endian.h /usr/include/sys/select.h
-resolvproto.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
-resolvproto.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
-resolvproto.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
-resolvproto.o: /usr/include/alloca.h /usr/include/unistd.h
-resolvproto.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h
-resolvproto.o: /usr/include/getopt.h /usr/include/signal.h
-resolvproto.o: /usr/include/bits/signum.h /usr/include/bits/siginfo.h
-resolvproto.o: /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h
-resolvproto.o: /usr/include/asm/sigcontext.h
-resolvproto.o: /usr/include/asm-i486/sigcontext.h
-resolvproto.o: /usr/include/linux/compiler.h /usr/include/bits/sigstack.h
-resolvproto.o: /usr/include/bits/sigthread.h /usr/include/sys/wait.h
-resolvproto.o: /usr/include/sys/resource.h /usr/include/bits/resource.h
-resolvproto.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h
-resolvproto.o: /usr/include/string.h /usr/include/sys/socket.h
-resolvproto.o: /usr/include/sys/uio.h /usr/include/bits/uio.h
-resolvproto.o: /usr/include/bits/socket.h /usr/include/limits.h
-resolvproto.o: /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h
-resolvproto.o: /usr/include/linux/limits.h /usr/include/bits/posix2_lim.h
-resolvproto.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h
-resolvproto.o: /usr/include/asm-i486/socket.h /usr/include/asm/sockios.h
-resolvproto.o: /usr/include/asm-i486/sockios.h /usr/include/netinet/in.h
-resolvproto.o: /usr/include/bits/in.h /usr/include/bits/byteswap.h
-resolvproto.o: /usr/include/arpa/inet.h /usr/include/netdb.h
-resolvproto.o: /usr/include/rpc/netdb.h /usr/include/bits/netdb.h
+resolvproto.o: /usr/include/bits/wordsize.h ipin.h ipheader.h dev.h ipout.h
+resolvproto.o: routetable.h

 routetable.o: routetable.h dev.h ipaddr.h /usr/include/stdint.h
 routetable.o: /usr/include/features.h /usr/include/sys/cdefs.h
 routetable.o: /usr/include/gnu/stubs.h /usr/include/bits/wchar.h
 routetable.o: routetable.h dev.h ipaddr.h /usr/include/stdint.h
 routetable.o: /usr/include/features.h /usr/include/sys/cdefs.h
 routetable.o: /usr/include/gnu/stubs.h /usr/include/bits/wchar.h


@@ -276,6 +280,19 @@ test_ipout.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h
 test_ipout.o: /usr/include/sys/ipc.h /usr/include/bits/ipctypes.h
 test_ipout.o: /usr/include/bits/ipc.h /usr/include/sys/msg.h
 test_ipout.o: /usr/include/bits/msq.h
 test_ipout.o: /usr/include/sys/ipc.h /usr/include/bits/ipctypes.h
 test_ipout.o: /usr/include/bits/ipc.h /usr/include/sys/msg.h
 test_ipout.o: /usr/include/bits/msq.h

+test_nameserver_file.o: nameserver.h devque.h dev.h ipaddr.h
+test_nameserver_file.o: /usr/include/stdint.h /usr/include/features.h
+test_nameserver_file.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
+test_nameserver_file.o: /usr/include/bits/wchar.h
+test_nameserver_file.o: /usr/include/bits/wordsize.h resolvproto.h ipin.h
+test_nameserver_file.o: ipheader.h ipout.h routetable.h
+test_nameserver_resolvnext.o: nameserver.h devque.h dev.h ipaddr.h
+test_nameserver_resolvnext.o: /usr/include/stdint.h /usr/include/features.h
+test_nameserver_resolvnext.o: /usr/include/sys/cdefs.h
+test_nameserver_resolvnext.o: /usr/include/gnu/stubs.h
+test_nameserver_resolvnext.o: /usr/include/bits/wchar.h
+test_nameserver_resolvnext.o: /usr/include/bits/wordsize.h resolvproto.h
+test_nameserver_resolvnext.o: ipin.h ipheader.h ipout.h routetable.h

 test_recv.o: devque.h dev.h /usr/include/unistd.h /usr/include/features.h
 test_recv.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
 test_recv.o: /usr/include/bits/posix_opt.h /usr/include/bits/types.h
 test_recv.o: devque.h dev.h /usr/include/unistd.h /usr/include/features.h
 test_recv.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
 test_recv.o: /usr/include/bits/posix_opt.h /usr/include/bits/types.h


@@ -290,14 +307,56 @@ test_recv.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
 test_recv.o: /usr/include/bits/sched.h /usr/include/sys/ipc.h
 test_recv.o: /usr/include/bits/ipctypes.h /usr/include/bits/ipc.h
 test_recv.o: /usr/include/sys/msg.h /usr/include/bits/msq.h
 test_recv.o: /usr/include/bits/sched.h /usr/include/sys/ipc.h
 test_recv.o: /usr/include/bits/ipctypes.h /usr/include/bits/ipc.h
 test_recv.o: /usr/include/sys/msg.h /usr/include/bits/msq.h

+test_resolvproto.o: resolvproto.h ipaddr.h /usr/include/stdint.h
+test_resolvproto.o: /usr/include/features.h /usr/include/sys/cdefs.h
+test_resolvproto.o: /usr/include/gnu/stubs.h /usr/include/bits/wchar.h
+test_resolvproto.o: /usr/include/bits/wordsize.h ipin.h ipheader.h dev.h
+test_resolvproto.o: ipout.h routetable.h libtcp.h /usr/include/stdio.h
+test_resolvproto.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+test_resolvproto.o: /usr/include/libio.h /usr/include/_G_config.h
+test_resolvproto.o: /usr/include/wchar.h /usr/include/gconv.h
+test_resolvproto.o: /usr/include/bits/stdio_lim.h
+test_resolvproto.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
+test_resolvproto.o: /usr/include/sys/types.h /usr/include/time.h
+test_resolvproto.o: /usr/include/endian.h /usr/include/bits/endian.h
+test_resolvproto.o: /usr/include/sys/select.h /usr/include/bits/select.h
+test_resolvproto.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+test_resolvproto.o: /usr/include/sys/sysmacros.h
+test_resolvproto.o: /usr/include/bits/pthreadtypes.h
+test_resolvproto.o: /usr/include/bits/sched.h /usr/include/alloca.h
+test_resolvproto.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
+test_resolvproto.o: /usr/include/bits/confname.h /usr/include/getopt.h
+test_resolvproto.o: /usr/include/signal.h /usr/include/bits/signum.h
+test_resolvproto.o: /usr/include/bits/siginfo.h /usr/include/bits/sigaction.h
+test_resolvproto.o: /usr/include/bits/sigcontext.h
+test_resolvproto.o: /usr/include/asm/sigcontext.h
+test_resolvproto.o: /usr/include/asm-i486/sigcontext.h
+test_resolvproto.o: /usr/include/linux/compiler.h
+test_resolvproto.o: /usr/include/bits/sigstack.h
+test_resolvproto.o: /usr/include/bits/sigthread.h /usr/include/sys/wait.h
+test_resolvproto.o: /usr/include/sys/resource.h /usr/include/bits/resource.h
+test_resolvproto.o: /usr/include/bits/waitflags.h
+test_resolvproto.o: /usr/include/bits/waitstatus.h /usr/include/string.h
+test_resolvproto.o: /usr/include/sys/socket.h /usr/include/sys/uio.h
+test_resolvproto.o: /usr/include/bits/uio.h /usr/include/bits/socket.h
+test_resolvproto.o: /usr/include/limits.h /usr/include/bits/posix1_lim.h
+test_resolvproto.o: /usr/include/bits/local_lim.h /usr/include/linux/limits.h
+test_resolvproto.o: /usr/include/bits/posix2_lim.h
+test_resolvproto.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h
+test_resolvproto.o: /usr/include/asm-i486/socket.h /usr/include/asm/sockios.h
+test_resolvproto.o: /usr/include/asm-i486/sockios.h /usr/include/netinet/in.h
+test_resolvproto.o: /usr/include/bits/in.h /usr/include/bits/byteswap.h
+test_resolvproto.o: /usr/include/arpa/inet.h /usr/include/netdb.h
+test_resolvproto.o: /usr/include/rpc/netdb.h /usr/include/bits/netdb.h

 test_resolvprotoc.o: resolvproto.h ipaddr.h /usr/include/stdint.h
 test_resolvprotoc.o: /usr/include/features.h /usr/include/sys/cdefs.h
 test_resolvprotoc.o: /usr/include/gnu/stubs.h /usr/include/bits/wchar.h
 test_resolvprotoc.o: resolvproto.h ipaddr.h /usr/include/stdint.h
 test_resolvprotoc.o: /usr/include/features.h /usr/include/sys/cdefs.h
 test_resolvprotoc.o: /usr/include/gnu/stubs.h /usr/include/bits/wchar.h

-test_resolvprotoc.o: /usr/include/bits/wordsize.h libtcp.h
-test_resolvprotoc.o: /usr/include/stdio.h /usr/include/bits/types.h
-test_resolvprotoc.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-test_resolvprotoc.o: /usr/include/_G_config.h /usr/include/wchar.h
-test_resolvprotoc.o: /usr/include/gconv.h /usr/include/bits/stdio_lim.h
+test_resolvprotoc.o: /usr/include/bits/wordsize.h ipin.h ipheader.h dev.h
+test_resolvprotoc.o: ipout.h routetable.h libtcp.h /usr/include/stdio.h
+test_resolvprotoc.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+test_resolvprotoc.o: /usr/include/libio.h /usr/include/_G_config.h
+test_resolvprotoc.o: /usr/include/wchar.h /usr/include/gconv.h
+test_resolvprotoc.o: /usr/include/bits/stdio_lim.h

 test_resolvprotoc.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
 test_resolvprotoc.o: /usr/include/sys/types.h /usr/include/time.h
 test_resolvprotoc.o: /usr/include/endian.h /usr/include/bits/endian.h
 test_resolvprotoc.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
 test_resolvprotoc.o: /usr/include/sys/types.h /usr/include/time.h
 test_resolvprotoc.o: /usr/include/endian.h /usr/include/bits/endian.h


@@ -334,50 +393,6 @@ test_resolvprotoc.o: /usr/include/netinet/in.h /usr/include/bits/in.h
 test_resolvprotoc.o: /usr/include/bits/byteswap.h /usr/include/arpa/inet.h
 test_resolvprotoc.o: /usr/include/netdb.h /usr/include/rpc/netdb.h
 test_resolvprotoc.o: /usr/include/bits/netdb.h
 test_resolvprotoc.o: /usr/include/bits/byteswap.h /usr/include/arpa/inet.h
 test_resolvprotoc.o: /usr/include/netdb.h /usr/include/rpc/netdb.h
 test_resolvprotoc.o: /usr/include/bits/netdb.h

-test_resolvprotos.o: resolvproto.h ipaddr.h /usr/include/stdint.h
-test_resolvprotos.o: /usr/include/features.h /usr/include/sys/cdefs.h
-test_resolvprotos.o: /usr/include/gnu/stubs.h /usr/include/bits/wchar.h
-test_resolvprotos.o: /usr/include/bits/wordsize.h libtcp.h
-test_resolvprotos.o: /usr/include/stdio.h /usr/include/bits/types.h
-test_resolvprotos.o: /usr/include/bits/typesizes.h /usr/include/libio.h
-test_resolvprotos.o: /usr/include/_G_config.h /usr/include/wchar.h
-test_resolvprotos.o: /usr/include/gconv.h /usr/include/bits/stdio_lim.h
-test_resolvprotos.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
-test_resolvprotos.o: /usr/include/sys/types.h /usr/include/time.h
-test_resolvprotos.o: /usr/include/endian.h /usr/include/bits/endian.h
-test_resolvprotos.o: /usr/include/sys/select.h /usr/include/bits/select.h
-test_resolvprotos.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
-test_resolvprotos.o: /usr/include/sys/sysmacros.h
-test_resolvprotos.o: /usr/include/bits/pthreadtypes.h
-test_resolvprotos.o: /usr/include/bits/sched.h /usr/include/alloca.h
-test_resolvprotos.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
-test_resolvprotos.o: /usr/include/bits/confname.h /usr/include/getopt.h
-test_resolvprotos.o: /usr/include/signal.h /usr/include/bits/signum.h
-test_resolvprotos.o: /usr/include/bits/siginfo.h
-test_resolvprotos.o: /usr/include/bits/sigaction.h
-test_resolvprotos.o: /usr/include/bits/sigcontext.h
-test_resolvprotos.o: /usr/include/asm/sigcontext.h
-test_resolvprotos.o: /usr/include/asm-i486/sigcontext.h
-test_resolvprotos.o: /usr/include/linux/compiler.h
-test_resolvprotos.o: /usr/include/bits/sigstack.h
-test_resolvprotos.o: /usr/include/bits/sigthread.h /usr/include/sys/wait.h
-test_resolvprotos.o: /usr/include/sys/resource.h /usr/include/bits/resource.h
-test_resolvprotos.o: /usr/include/bits/waitflags.h
-test_resolvprotos.o: /usr/include/bits/waitstatus.h /usr/include/string.h
-test_resolvprotos.o: /usr/include/sys/socket.h /usr/include/sys/uio.h
-test_resolvprotos.o: /usr/include/bits/uio.h /usr/include/bits/socket.h
-test_resolvprotos.o: /usr/include/limits.h /usr/include/bits/posix1_lim.h
-test_resolvprotos.o: /usr/include/bits/local_lim.h
-test_resolvprotos.o: /usr/include/linux/limits.h
-test_resolvprotos.o: /usr/include/bits/posix2_lim.h
-test_resolvprotos.o: /usr/include/bits/sockaddr.h /usr/include/asm/socket.h
-test_resolvprotos.o: /usr/include/asm-i486/socket.h
-test_resolvprotos.o: /usr/include/asm/sockios.h
-test_resolvprotos.o: /usr/include/asm-i486/sockios.h
-test_resolvprotos.o: /usr/include/netinet/in.h /usr/include/bits/in.h
-test_resolvprotos.o: /usr/include/bits/byteswap.h /usr/include/arpa/inet.h
-test_resolvprotos.o: /usr/include/netdb.h /usr/include/rpc/netdb.h
-test_resolvprotos.o: /usr/include/bits/netdb.h

 test_send.o: devque.h dev.h /usr/include/unistd.h /usr/include/features.h
 test_send.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
 test_send.o: /usr/include/bits/posix_opt.h /usr/include/bits/types.h
 test_send.o: devque.h dev.h /usr/include/unistd.h /usr/include/features.h
 test_send.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
 test_send.o: /usr/include/bits/posix_opt.h /usr/include/bits/types.h