[pxeprefix] Search for the PXE entry points through all methods

[people/asdlkf/gpxe.git] / src / proto / nmb.c

diff --git a/src/proto/nmb.c b/src/proto/nmb.c
index b395dab..e1fc911 100644 (file)
--- a/src/proto/nmb.c
+++ b/src/proto/nmb.c
@@ -1,6 +1,8 @@
+#if 0
+
 #include "resolv.h"
 #include "string.h"
-#include "dns.h"
+#include <gpxe/dns.h>
 #include "nic.h"
 #include "nmb.h"
 
@@ -15,6 +17,7 @@ static inline char * nbns_make_name ( char *dest, const char *name ) {
        char nb_name[16];
        char c;
        int i;
+       uint16_t *d;
 
        *(dest++) = 32; /* Length is always 32 */
 
@@ -26,11 +29,13 @@ static inline char * nbns_make_name ( char *dest, const char *name ) {
        memset ( nb_name, ' ', 15 );
        nb_name[15] = '\0';
        memcpy ( nb_name, name, strlen ( name ) ); /* Do not copy NUL */
+
+       d = ( uint16_t * ) dest;
        for ( i = 0 ; i < 16 ; i++ ) {
                c = nb_name[i];
-               *( ( ( uint16_t * ) dest ) ++ ) = 
-                       htons ( ( ( c | ( c << 4 ) ) & 0x0f0f ) + 0x4141 );
+               *( d++ )  = htons ( ( ( c | ( c << 4 ) ) & 0x0f0f ) + 0x4141 );
        }
+       dest = ( char * ) d;
 
        *(dest++) = 0; /* Terminating 0-length name component */
        return dest;
@@ -51,7 +56,7 @@ static int nmb_resolv ( struct in_addr *addr, const char *name ) {
        DBG ( "NMB resolving %s\n", name );
 
        /* Set up the query data */
-       nameserver.sin_addr.s_addr = IP_BROADCAST;
+       nameserver.sin_addr.s_addr = INADDR_BROADCAST;
        nameserver.sin_port = NBNS_UDP_PORT;
        memset ( &query, 0, sizeof ( query ) );
        query.dns.id = htons ( 1 );
@@ -97,7 +102,9 @@ static int nmb_resolv ( struct in_addr *addr, const char *name ) {
        return 1;
 }
 
-static struct resolver nmb_resolver __resolver = {
+struct resolver nmb_resolver __resolver = {
        .name = "NMB",
        .resolv = nmb_resolv,
 };
+
+#endif