Moved include/in.h to include/gpxe/in.h, so that it can be included by

prototester.

diff --git a/src/include/dns.h b/src/include/dns.h
index 33ee73fe567ecadbc36eac6b88a35b9ca0103365..c72c6909bfa03a3a97371ed2ccf9907f786df49e 100644 (file)
--- a/src/include/dns.h
+++ b/src/include/dns.h
@@ -2,7 +2,7 @@
 #define DNS_RESOLVER_H
 
 #include "stdint.h"
-#include "in.h"
+#include <gpxe/in.h>
 #include "ip.h"
 #include "udp.h"
 

diff --git a/src/include/etherboot.h b/src/include/etherboot.h
index b9546c043e73fec2f6578e955775f1c0a4ff17d0..d8fcc98c26a45a557376ca781fde199986fdbd2c 100644 (file)
--- a/src/include/etherboot.h
+++ b/src/include/etherboot.h
@@ -133,7 +133,7 @@ enum {
 #define        RARP_REQUEST    3
 #define        RARP_REPLY      4
 
-#include       "in.h"
+#include <gpxe/in.h>
 
 
 /* Helper macros used to identify when DHCP options are valid/invalid in/outside of encapsulation */

diff --git a/src/include/in.h b/src/include/gpxe/in.h
similarity index 100%
rename from src/include/in.h
rename to src/include/gpxe/in.h

diff --git a/src/include/igmp.h b/src/include/igmp.h
index 48753eab5c9c6705d2a21ed653b8cb834281ce0d..8b3292f2678d6d3383027adb8191718def8d52a9 100644 (file)
--- a/src/include/igmp.h
+++ b/src/include/igmp.h
@@ -2,7 +2,7 @@
 #define        IGMP_H
 
 #include "stdint.h"
-#include "in.h"
+#include <gpxe/in.h>
 
 #define IGMP_QUERY     0x11
 #define IGMPv1_REPORT  0x12

diff --git a/src/include/ip.h b/src/include/ip.h
index 5c9b7271b601e1fd521fcc0418b395fc11c15e7f..9da7f56a9e82e15cfa23f777fe8891480f675792 100644 (file)
--- a/src/include/ip.h
+++ b/src/include/ip.h
@@ -3,7 +3,7 @@
 
 #include "stddef.h"
 #include "stdint.h"
-#include "in.h"
+#include <gpxe/in.h>
 
 struct iphdr {
        uint8_t  verhdrlen;

diff --git a/src/include/proto.h b/src/include/proto.h
index fb4e4137ca7d82c4c5bed40c97339d8ee992d231..886d76e37c71650dc53304b3a9e53995f8fe156c 100644 (file)
--- a/src/include/proto.h
+++ b/src/include/proto.h
@@ -3,7 +3,7 @@
 
 #include "tables.h"
 #include "buffer.h"
-#include "in.h"
+#include <gpxe/in.h>
 
 struct protocol {
        char *name;

diff --git a/src/include/resolv.h b/src/include/resolv.h
index 1ca8a584ac6eebad84b5ce47c8b91261b1aaf73a..1c74081e492b5c25a0056a66568bb4c841e1f95c 100644 (file)
--- a/src/include/resolv.h
+++ b/src/include/resolv.h
@@ -1,7 +1,7 @@
 #ifndef RESOLV_H
 #define RESOLV_H
 
-#include "in.h"
+#include <gpxe/in.h>
 #include "tables.h"
 
 struct resolver {

diff --git a/src/include/tftp.h b/src/include/tftp.h
index 2a086eb2bd1681b7fe3a552ab4745fb1283a9cba..ae8f35192ddfbbdb2effc2d6622752277d59f8d7 100644 (file)
--- a/src/include/tftp.h
+++ b/src/include/tftp.h
@@ -3,7 +3,7 @@
 
 /** @file */
 
-#include "in.h"
+#include <gpxe/in.h>
 #include "buffer.h"
 #include "nic.h"
 #include "ip.h"
@@ -139,6 +139,15 @@ struct tftp_state {
         * TFTP server.  Note that the first data block is block 1; a
         * value of 0 indicates that no data blocks have yet been
         * received.
+        *
+        * For multicast TFTP protocols, where the blocks may not be
+        * received in strict order, the meaning of this field changes
+        * slightly, to "first missing block minus one".  For example,
+        * suppose that we have received blocks 1, 2, 4 and 5; this
+        * field would then have the value 2, since the first missing
+        * block is block 3.  If the blocks do arrive in strict order,
+        * this definition is exactly equivalent to "most recently
+        * received block".
         */
        unsigned int block;
 };

diff --git a/src/include/udp.h b/src/include/udp.h
index d06c5999ca774bb8d1e71b12e604bc9764c2f0ec..7814c5f43195e915c6b7110cf586631ff9101c76 100644 (file)
--- a/src/include/udp.h
+++ b/src/include/udp.h
@@ -3,7 +3,7 @@
 
 #include "stddef.h"
 #include "stdint.h"
-#include "in.h"
+#include <gpxe/in.h>
 #include "ip.h"
 
 struct udp_pseudo_hdr {

diff --git a/src/include/url.h b/src/include/url.h
index add34e3976bff4b164de79ef5eee134db4d29076..f0207b99f8a2b6d0b90cd9bb6ada355ed35ae383 100644 (file)
--- a/src/include/url.h
+++ b/src/include/url.h
@@ -2,7 +2,7 @@
 #define URL_H
 
 #include "proto.h"
-#include "in.h"
+#include <gpxe/in.h>
 
 extern int parse_url ( char *url, struct protocol **proto,
                       struct sockaddr_in *server, char **filename );

diff --git a/src/proto/nfs.c b/src/proto/nfs.c
index 311409a6b0bc6b6e1537b595bcd066839ff96f7d..828aa8717962991bb094867a24b4a946f5191e70 100644 (file)
--- a/src/proto/nfs.c
+++ b/src/proto/nfs.c
@@ -1,7 +1,7 @@
 #include "etherboot.h"
 #include "init.h"
 #include "proto.h"
-#include "in.h"
+#include <gpxe/in.h>
 #include "nic.h"
 
 /* NOTE: the NFS code is heavily inspired by the NetBSD netboot code (read: