Add udp_sendto_via() to allow e.g. DHCP to transmit without first having

to set up dummy routing entries.

diff --git a/src/include/gpxe/udp.h b/src/include/gpxe/udp.h
index d32c87823767fbeb5cf00dfb409fdc120325ced2..074c5e1dd95aa005bb93691b9fff5b738cf7cef1 100644 (file)
--- a/src/include/gpxe/udp.h
+++ b/src/include/gpxe/udp.h
@@ -14,6 +14,8 @@
 #include <gpxe/tcpip.h>
 #include <gpxe/if_ether.h>
 
+struct net_device;
+
 /**
  * UDP constants
  */
@@ -161,5 +163,8 @@ extern int udp_send ( struct udp_connection *conn,
 extern int udp_sendto ( struct udp_connection *conn,
                        struct sockaddr_tcpip *peer,
                        const void *data, size_t len );
+int udp_sendto_via ( struct udp_connection *conn, struct sockaddr_tcpip *peer,
+                    struct net_device *netdev, const void *data,
+                    size_t len );
 
 #endif /* _GPXE_UDP_H */

diff --git a/src/net/udp.c b/src/net/udp.c
index 32dfaec3d821affcab61d263e75033ae32722151..05e288bf803f546a4e293f94eb73b94813e795e7 100644 (file)
--- a/src/net/udp.c
+++ b/src/net/udp.c
@@ -115,6 +115,7 @@ int udp_senddata ( struct udp_connection *conn ) {
  *
  * @v conn             UDP connection
  * @v peer             Destination address
+ * @v netdev           Net device via which to send (or NULL)
  * @v data             Data to send
  * @v len              Length of data
  * @ret rc             Return status code
@@ -125,8 +126,9 @@ int udp_senddata ( struct udp_connection *conn ) {
  * call udp_senddata() and wait for its senddata() method to be
  * called.
  */
-int udp_sendto ( struct udp_connection *conn, struct sockaddr_tcpip *peer,
-                const void *data, size_t len ) {
+int udp_sendto_via ( struct udp_connection *conn, struct sockaddr_tcpip *peer,
+                    struct net_device *netdev, const void *data,
+                    size_t len ) {
                struct udp_header *udphdr;
        struct pk_buff *pkb;
 
@@ -162,7 +164,27 @@ int udp_sendto ( struct udp_connection *conn, struct sockaddr_tcpip *peer,
               ntohs ( udphdr->len ) );
 
        /* Send it to the next layer for processing */
-       return tcpip_tx ( pkb, &udp_protocol, peer, NULL, &udphdr->chksum );
+       return tcpip_tx ( pkb, &udp_protocol, peer, netdev, &udphdr->chksum );
+}
+
+/**
+ * Transmit data via a UDP connection to a specified address
+ *
+ * @v conn             UDP connection
+ * @v peer             Destination address
+ * @v data             Data to send
+ * @v len              Length of data
+ * @ret rc             Return status code
+ *
+ * This function fills up the UDP headers and sends the data.  It may
+ * be called only from within the context of an application's
+ * senddata() method; if the application wishes to send data it must
+ * call udp_senddata() and wait for its senddata() method to be
+ * called.
+ */
+int udp_sendto ( struct udp_connection *conn, struct sockaddr_tcpip *peer,
+                const void *data, size_t len ) {
+       return udp_sendto_via ( conn, peer, NULL, data, len );
 }
 
 /**