]> git.sur5r.net Git - u-boot/commitdiff
net: cosmetic: bootp.* checkpatch compliance
authorJoe Hershberger <joe.hershberger@ni.com>
Tue, 15 May 2012 08:59:06 +0000 (08:59 +0000)
committerJoe Hershberger <joe.hershberger@ni.com>
Tue, 15 May 2012 22:15:58 +0000 (17:15 -0500)
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
net/bootp.c
net/bootp.h

index 35654b4b50e809e2a96f5221f3229eebc4902c3f..d0a7da248e4e9c57251548bbafb82b5568384698 100644 (file)
 #endif
 #include <linux/compiler.h>
 
-#define BOOTP_VENDOR_MAGIC     0x63825363      /* RFC1048 Magic Cookie         */
+#define BOOTP_VENDOR_MAGIC     0x63825363      /* RFC1048 Magic Cookie */
 
 #define TIMEOUT                5000UL  /* Milliseconds before trying BOOTP again */
 #ifndef CONFIG_NET_RETRY_COUNT
-# define TIMEOUT_COUNT 5               /* # of timeouts before giving up  */
+# define TIMEOUT_COUNT 5               /* # of timeouts before giving up */
 #else
 # define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT)
 #endif
 
-#define PORT_BOOTPS    67              /* BOOTP server UDP port                */
-#define PORT_BOOTPC    68              /* BOOTP client UDP port                */
+#define PORT_BOOTPS    67              /* BOOTP server UDP port */
+#define PORT_BOOTPC    68              /* BOOTP client UDP port */
 
-#ifndef CONFIG_DHCP_MIN_EXT_LEN                /* minimal length of extension list     */
+#ifndef CONFIG_DHCP_MIN_EXT_LEN                /* minimal length of extension list */
 #define CONFIG_DHCP_MIN_EXT_LEN 64
 #endif
 
@@ -43,8 +43,8 @@ ulong         seed1, seed2;
 
 #if defined(CONFIG_CMD_DHCP)
 dhcp_state_t dhcp_state = INIT;
-unsigned long dhcp_leasetime = 0;
-IPaddr_t NetDHCPServerIP = 0;
+unsigned long dhcp_leasetime;
+IPaddr_t NetDHCPServerIP;
 static void DhcpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
                        unsigned len);
 
@@ -64,37 +64,29 @@ static char *dhcpmsg2str(int type)
        }
 }
 #endif
-
-#if defined(CONFIG_BOOTP_VENDOREX)
-extern u8 *dhcp_vendorex_prep (u8 *e); /*rtn new e after add own opts. */
-extern u8 *dhcp_vendorex_proc (u8 *e); /*rtn next e if mine,else NULL  */
-#endif
-
 #endif
 
 static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src, unsigned len)
 {
-       Bootp_t *bp = (Bootp_t *) pkt;
+       struct Bootp_t *bp = (struct Bootp_t *) pkt;
        int retval = 0;
 
        if (dest != PORT_BOOTPC || src != PORT_BOOTPS)
                retval = -1;
-       else if (len < sizeof (Bootp_t) - OPT_SIZE)
+       else if (len < sizeof(struct Bootp_t) - OPT_SIZE)
                retval = -2;
        else if (bp->bp_op != OP_BOOTREQUEST &&
-           bp->bp_op != OP_BOOTREPLY &&
-           bp->bp_op != DHCP_OFFER &&
-           bp->bp_op != DHCP_ACK &&
-           bp->bp_op != DHCP_NAK ) {
+                       bp->bp_op != OP_BOOTREPLY &&
+                       bp->bp_op != DHCP_OFFER &&
+                       bp->bp_op != DHCP_ACK &&
+                       bp->bp_op != DHCP_NAK)
                retval = -3;
-       }
        else if (bp->bp_htype != HWT_ETHER)
                retval = -4;
        else if (bp->bp_hlen != HWL_ETHER)
                retval = -5;
-       else if (NetReadLong((ulong*)&bp->bp_id) != BootpID) {
+       else if (NetReadLong((ulong *)&bp->bp_id) != BootpID)
                retval = -6;
-       }
 
        debug("Filtering pkt = %d\n", retval);
 
@@ -104,7 +96,7 @@ static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src, unsigned len)
 /*
  * Copy parameters of interest from BOOTP_REPLY/DHCP_OFFER packet
  */
-static void BootpCopyNetParams(Bootp_t *bp)
+static void BootpCopyNetParams(struct Bootp_t *bp)
 {
        __maybe_unused IPaddr_t tmp_ip;
 
@@ -113,10 +105,10 @@ static void BootpCopyNetParams(Bootp_t *bp)
        NetCopyIP(&tmp_ip, &bp->bp_siaddr);
        if (tmp_ip != 0)
                NetCopyIP(&NetServerIP, &bp->bp_siaddr);
-       memcpy (NetServerEther, ((Ethernet_t *)NetRxPacket)->et_src, 6);
+       memcpy(NetServerEther, ((Ethernet_t *)NetRxPacket)->et_src, 6);
 #endif
        if (strlen(bp->bp_file) > 0)
-               copy_filename (BootFile, bp->bp_file, sizeof(BootFile));
+               copy_filename(BootFile, bp->bp_file, sizeof(BootFile));
 
        debug("Bootfile: %s\n", BootFile);
 
@@ -124,97 +116,95 @@ static void BootpCopyNetParams(Bootp_t *bp)
         * don't delete exising entry when BOOTP / DHCP reply does
         * not contain a new value
         */
-       if (*BootFile) {
-               setenv ("bootfile", BootFile);
-       }
+       if (*BootFile)
+               setenv("bootfile", BootFile);
 }
 
-static int truncate_sz (const char *name, int maxlen, int curlen)
+static int truncate_sz(const char *name, int maxlen, int curlen)
 {
        if (curlen >= maxlen) {
-               printf("*** WARNING: %s is too long (%d - max: %d) - truncated\n",
-                       name, curlen, maxlen);
+               printf("*** WARNING: %s is too long (%d - max: %d)"
+                       " - truncated\n", name, curlen, maxlen);
                curlen = maxlen - 1;
        }
-       return (curlen);
+       return curlen;
 }
 
 #if !defined(CONFIG_CMD_DHCP)
 
-static void BootpVendorFieldProcess (u8 * ext)
+static void BootpVendorFieldProcess(u8 *ext)
 {
        int size = *(ext + 1);
 
        debug("[BOOTP] Processing extension %d... (%d bytes)\n", *ext,
-                  *(ext + 1));
+               *(ext + 1));
 
        NetBootFileSize = 0;
 
        switch (*ext) {
                /* Fixed length fields */
-       case 1:                 /* Subnet mask                                  */
+       case 1:                 /* Subnet mask */
                if (NetOurSubnetMask == 0)
-                       NetCopyIP (&NetOurSubnetMask, (IPaddr_t *) (ext + 2));
+                       NetCopyIP(&NetOurSubnetMask, (IPaddr_t *) (ext + 2));
                break;
-       case 2:                 /* Time offset - Not yet supported              */
+       case 2:                 /* Time offset - Not yet supported */
                break;
                /* Variable length fields */
-       case 3:                 /* Gateways list                                */
-               if (NetOurGatewayIP == 0) {
-                       NetCopyIP (&NetOurGatewayIP, (IPaddr_t *) (ext + 2));
-               }
+       case 3:                 /* Gateways list */
+               if (NetOurGatewayIP == 0)
+                       NetCopyIP(&NetOurGatewayIP, (IPaddr_t *) (ext + 2));
                break;
-       case 4:                 /* Time server - Not yet supported              */
+       case 4:                 /* Time server - Not yet supported */
                break;
-       case 5:                 /* IEN-116 name server - Not yet supported      */
+       case 5:                 /* IEN-116 name server - Not yet supported */
                break;
        case 6:
-               if (NetOurDNSIP == 0) {
-                       NetCopyIP (&NetOurDNSIP, (IPaddr_t *) (ext + 2));
-               }
+               if (NetOurDNSIP == 0)
+                       NetCopyIP(&NetOurDNSIP, (IPaddr_t *) (ext + 2));
 #if defined(CONFIG_BOOTP_DNS2)
-               if ((NetOurDNS2IP == 0) && (size > 4)) {
-                       NetCopyIP (&NetOurDNS2IP, (IPaddr_t *) (ext + 2 + 4));
-               }
+               if ((NetOurDNS2IP == 0) && (size > 4))
+                       NetCopyIP(&NetOurDNS2IP, (IPaddr_t *) (ext + 2 + 4));
 #endif
                break;
-       case 7:                 /* Log server - Not yet supported               */
+       case 7:                 /* Log server - Not yet supported */
                break;
-       case 8:                 /* Cookie/Quote server - Not yet supported      */
+       case 8:                 /* Cookie/Quote server - Not yet supported */
                break;
-       case 9:                 /* LPR server - Not yet supported               */
+       case 9:                 /* LPR server - Not yet supported */
                break;
-       case 10:                /* Impress server - Not yet supported           */
+       case 10:                /* Impress server - Not yet supported */
                break;
-       case 11:                /* RPL server - Not yet supported               */
+       case 11:                /* RPL server - Not yet supported */
                break;
-       case 12:                /* Host name                                    */
+       case 12:                /* Host name */
                if (NetOurHostName[0] == 0) {
-                       size = truncate_sz ("Host Name", sizeof (NetOurHostName), size);
-                       memcpy (&NetOurHostName, ext + 2, size);
+                       size = truncate_sz("Host Name",
+                               sizeof(NetOurHostName), size);
+                       memcpy(&NetOurHostName, ext + 2, size);
                        NetOurHostName[size] = 0;
                }
                break;
-       case 13:                /* Boot file size                               */
+       case 13:                /* Boot file size */
                if (size == 2)
-                       NetBootFileSize = ntohs (*(ushort *) (ext + 2));
+                       NetBootFileSize = ntohs(*(ushort *) (ext + 2));
                else if (size == 4)
-                       NetBootFileSize = ntohl (*(ulong *) (ext + 2));
+                       NetBootFileSize = ntohl(*(ulong *) (ext + 2));
                break;
-       case 14:                /* Merit dump file - Not yet supported          */
+       case 14:                /* Merit dump file - Not yet supported */
                break;
-       case 15:                /* Domain name - Not yet supported              */
+       case 15:                /* Domain name - Not yet supported */
                break;
-       case 16:                /* Swap server - Not yet supported              */
+       case 16:                /* Swap server - Not yet supported */
                break;
-       case 17:                /* Root path                                    */
+       case 17:                /* Root path */
                if (NetOurRootPath[0] == 0) {
-                       size = truncate_sz ("Root Path", sizeof (NetOurRootPath), size);
-                       memcpy (&NetOurRootPath, ext + 2, size);
+                       size = truncate_sz("Root Path",
+                               sizeof(NetOurRootPath), size);
+                       memcpy(&NetOurRootPath, ext + 2, size);
                        NetOurRootPath[size] = 0;
                }
                break;
-       case 18:                /* Extension path - Not yet supported           */
+       case 18:                /* Extension path - Not yet supported */
                /*
                 * This can be used to send the information of the
                 * vendor area in another file that the client can
@@ -222,10 +212,11 @@ static void BootpVendorFieldProcess (u8 * ext)
                 */
                break;
                /* IP host layer fields */
-       case 40:                /* NIS Domain name                              */
+       case 40:                /* NIS Domain name */
                if (NetOurNISDomain[0] == 0) {
-                       size = truncate_sz ("NIS Domain Name", sizeof (NetOurNISDomain), size);
-                       memcpy (&NetOurNISDomain, ext + 2, size);
+                       size = truncate_sz("NIS Domain Name",
+                               sizeof(NetOurNISDomain), size);
+                       memcpy(&NetOurNISDomain, ext + 2, size);
                        NetOurNISDomain[size] = 0;
                }
                break;
@@ -235,7 +226,7 @@ static void BootpVendorFieldProcess (u8 * ext)
                break;
 #endif
                /* Application layer fields */
-       case 43:                /* Vendor specific info - Not yet supported     */
+       case 43:                /* Vendor specific info - Not yet supported */
                /*
                 * Binary information to exchange specific
                 * product information.
@@ -245,7 +236,7 @@ static void BootpVendorFieldProcess (u8 * ext)
        }
 }
 
-static void BootpVendorProcess (u8 * ext, int size)
+static void BootpVendorProcess(u8 *ext, int size)
 {
        u8 *end = ext + size;
 
@@ -259,11 +250,11 @@ static void BootpVendorProcess (u8 * ext, int size)
 
                        ext += ext[1] + 2;
                        if (ext <= end)
-                               BootpVendorFieldProcess (opt);
+                               BootpVendorFieldProcess(opt);
                }
        }
 
-       debug("[BOOTP] Received fields: \n");
+       debug("[BOOTP] Received fields:\n");
        if (NetOurSubnetMask)
                debug("NetOurSubnetMask : %pI4\n", &NetOurSubnetMask);
 
@@ -298,27 +289,28 @@ static void
 BootpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
             unsigned len)
 {
-       Bootp_t *bp;
+       struct Bootp_t *bp;
 
        debug("got BOOTP packet (src=%d, dst=%d, len=%d want_len=%zu)\n",
-               src, dest, len, sizeof (Bootp_t));
+               src, dest, len, sizeof(struct Bootp_t));
 
-       bp = (Bootp_t *)pkt;
+       bp = (struct Bootp_t *)pkt;
 
-       if (BootpCheckPkt(pkt, dest, src, len)) /* Filter out pkts we don't want */
+       /* Filter out pkts we don't want */
+       if (BootpCheckPkt(pkt, dest, src, len))
                return;
 
        /*
         *      Got a good BOOTP reply.  Copy the data into our variables.
         */
 #ifdef CONFIG_STATUS_LED
-       status_led_set (STATUS_LED_BOOT, STATUS_LED_OFF);
+       status_led_set(STATUS_LED_BOOT, STATUS_LED_OFF);
 #endif
 
        BootpCopyNetParams(bp);         /* Store net parameters from reply */
 
        /* Retrieve extended information (we must parse the vendor area) */
-       if (NetReadLong((ulong*)&bp->bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC))
+       if (NetReadLong((ulong *)&bp->bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC))
                BootpVendorProcess((uchar *)&bp->bp_vend[4], len);
 
        NetSetTimeout(0, (thand_f *)0);
@@ -337,11 +329,11 @@ static void
 BootpTimeout(void)
 {
        if (BootpTry >= TIMEOUT_COUNT) {
-               puts ("\nRetry count exceeded; starting again\n");
-               NetStartAgain ();
+               puts("\nRetry count exceeded; starting again\n");
+               NetStartAgain();
        } else {
-               NetSetTimeout (TIMEOUT, BootpTimeout);
-               BootpRequest ();
+               NetSetTimeout(TIMEOUT, BootpTimeout);
+               BootpRequest();
        }
 }
 
@@ -349,7 +341,8 @@ BootpTimeout(void)
  *     Initialize BOOTP extension fields in the request.
  */
 #if defined(CONFIG_CMD_DHCP)
-static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t RequestedIP)
+static int DhcpExtended(u8 *e, int message_type, IPaddr_t ServerID,
+                       IPaddr_t RequestedIP)
 {
        u8 *start = e;
        u8 *cnt;
@@ -381,7 +374,7 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R
        *e++ = (576 - 312 + OPT_SIZE) & 0xff;
 
        if (ServerID) {
-               int tmp = ntohl (ServerID);
+               int tmp = ntohl(ServerID);
 
                *e++ = 54;      /* ServerID */
                *e++ = 4;
@@ -392,7 +385,7 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R
        }
 
        if (RequestedIP) {
-               int tmp = ntohl (RequestedIP);
+               int tmp = ntohl(RequestedIP);
 
                *e++ = 50;      /* Requested IP */
                *e++ = 4;
@@ -402,12 +395,13 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R
                *e++ = tmp & 0xff;
        }
 #if defined(CONFIG_BOOTP_SEND_HOSTNAME)
-       if ((hostname = getenv ("hostname"))) {
-               int hostnamelen = strlen (hostname);
+       hostname = getenv("hostname");
+       if (hostname) {
+               int hostnamelen = strlen(hostname);
 
                *e++ = 12;      /* Hostname */
                *e++ = hostnamelen;
-               memcpy (e, hostname, hostnamelen);
+               memcpy(e, hostname, hostnamelen);
                e += hostnamelen;
        }
 #endif
@@ -448,7 +442,8 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R
 #endif
 
 #if defined(CONFIG_BOOTP_VENDOREX)
-       if ((x = dhcp_vendorex_prep (e)))
+       x = dhcp_vendorex_prep(e);
+       if (x)
                return x - start;
 #endif
 
@@ -508,9 +503,9 @@ static int DhcpExtended (u8 * e, int message_type, IPaddr_t ServerID, IPaddr_t R
 
 #else
 /*
- *     Warning: no field size check - change CONFIG_BOOTP_* at your own risk!
+ * Warning: no field size check - change CONFIG_BOOTP_* at your own risk!
  */
-static int BootpExtended (u8 * e)
+static int BootpExtended(u8 *e)
 {
        u8 *start = e;
 
@@ -584,10 +579,10 @@ static int BootpExtended (u8 * e)
 #endif
 
 void
-BootpRequest (void)
+BootpRequest(void)
 {
        uchar *pkt, *iphdr;
-       Bootp_t *bp;
+       struct Bootp_t *bp;
        int ext_len, pktlen, iplen;
 
        bootstage_mark_name(BOOTSTAGE_ID_BOOTP_START, "bootp_start");
@@ -600,22 +595,22 @@ BootpRequest (void)
        int   reg;
        ulong tst1, tst2, sum, m_mask, m_value = 0;
 
-       if (BootpTry ==0) {
+       if (BootpTry == 0) {
                /* get our mac */
                eth_getenv_enetaddr("ethaddr", bi_enetaddr);
 
                debug("BootpRequest => Our Mac: ");
-               for (reg=0; reg<6; reg++)
-                       debug("%x%c", bi_enetaddr[reg], reg==5 ? '\n' : ':');
+               for (reg = 0; reg < 6; reg++)
+                       debug("%x%c", bi_enetaddr[reg], reg == 5 ? '\n' : ':');
 
                /* Mac-Manipulation 2 get seed1 */
-               tst1=0;
-               tst2=0;
-               for (reg=2; reg<6; reg++) {
+               tst1 = 0;
+               tst2 = 0;
+               for (reg = 2; reg < 6; reg++) {
                        tst1 = tst1 << 8;
                        tst1 = tst1 | bi_enetaddr[reg];
                }
-               for (reg=0; reg<2; reg++) {
+               for (reg = 0; reg < 2; reg++) {
                        tst2 = tst2 | bi_enetaddr[reg];
                        tst2 = tst2 << 8;
                }
@@ -623,8 +618,8 @@ BootpRequest (void)
                seed1 = tst1^tst2;
 
                /* Mirror seed1*/
-               m_mask=0x1;
-               for (reg=1;reg<=32;reg++) {
+               m_mask = 0x1;
+               for (reg = 1; reg <= 32; reg++) {
                        m_value |= (m_mask & seed1);
                        seed1 = seed1 >> 1;
                        m_value = m_value << 1;
@@ -634,44 +629,45 @@ BootpRequest (void)
        }
 
        /* Random Number Generator */
-
-       for (reg=0;reg<=0;reg++) {
+       for (reg = 0; reg <= 0; reg++) {
                sum = seed1 + seed2;
                if (sum < seed1 || sum < seed2)
                        sum++;
                seed2 = seed1;
                seed1 = sum;
 
-               if (BootpTry<=2) {      /* Start with max 1024 * 1ms */
+               if (BootpTry <= 2) {    /* Start with max 1024 * 1ms */
                        sum = sum >> (22-BootpTry);
-               } else {                /*After 3rd BOOTP request max 8192 * 1ms */
+               } else {        /*After 3rd BOOTP request max 8192 * 1ms */
                        sum = sum >> 19;
                }
        }
 
-       printf ("Random delay: %ld ms...\n", sum);
-       for (reg=0; reg <sum; reg++) {
+       printf("Random delay: %ld ms...\n", sum);
+       for (reg = 0; reg < sum; reg++)
                udelay(1000); /*Wait 1ms*/
-       }
+
 #endif /* CONFIG_BOOTP_RANDOM_DELAY */
 
        printf("BOOTP broadcast %d\n", ++BootpTry);
        pkt = NetTxPacket;
-       memset ((void*)pkt, 0, PKTSIZE);
+       memset((void *)pkt, 0, PKTSIZE);
 
        pkt += NetSetEther(pkt, NetBcastAddr, PROT_IP);
 
        /*
-        * Next line results in incorrect packet size being transmitted, resulting
-        * in errors in some DHCP servers, reporting missing bytes.  Size must be
-        * set in packet header after extension length has been determined.
+        * Next line results in incorrect packet size being transmitted,
+        * resulting in errors in some DHCP servers, reporting missing bytes.
+        * Size must be set in packet header after extension length has been
+        * determined.
         * C. Hallinan, DS4.COM, Inc.
         */
-       /* NetSetIP(pkt, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, sizeof (Bootp_t)); */
+       /* NetSetIP(pkt, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC,
+               sizeof (struct Bootp_t)); */
        iphdr = pkt;    /* We need this later for NetSetIP() */
        pkt += IP_HDR_SIZE;
 
-       bp = (Bootp_t *)pkt;
+       bp = (struct Bootp_t *)pkt;
        bp->bp_op = OP_BOOTREQUEST;
        bp->bp_htype = HWT_ETHER;
        bp->bp_hlen = HWL_ETHER;
@@ -681,8 +677,8 @@ BootpRequest (void)
        NetWriteIP(&bp->bp_yiaddr, 0);
        NetWriteIP(&bp->bp_siaddr, 0);
        NetWriteIP(&bp->bp_giaddr, 0);
-       memcpy (bp->bp_chaddr, NetOurEther, 6);
-       copy_filename (bp->bp_file, BootFile, sizeof(bp->bp_file));
+       memcpy(bp->bp_chaddr, NetOurEther, 6);
+       copy_filename(bp->bp_file, BootFile, sizeof(bp->bp_file));
 
        /* Request additional information from the BOOTP/DHCP server */
 #if defined(CONFIG_CMD_DHCP)
@@ -707,7 +703,8 @@ BootpRequest (void)
         * Calculate proper packet lengths taking into account the
         * variable size of the options field
         */
-       pktlen = ((int)(pkt-NetTxPacket)) + BOOTP_HDR_SIZE - sizeof(bp->bp_vend) + ext_len;
+       pktlen = ((int)(pkt-NetTxPacket)) + BOOTP_HDR_SIZE -
+               sizeof(bp->bp_vend) + ext_len;
        iplen = BOOTP_HDR_SIZE - sizeof(bp->bp_vend) + ext_len;
        NetSetIP(iphdr, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, iplen);
        NetSetTimeout(SELECT_TIMEOUT, BootpTimeout);
@@ -722,7 +719,7 @@ BootpRequest (void)
 }
 
 #if defined(CONFIG_CMD_DHCP)
-static void DhcpOptionsProcess (uchar * popt, Bootp_t *bp)
+static void DhcpOptionsProcess(uchar *popt, struct Bootp_t *bp)
 {
        uchar *end = popt + BOOTP_HDR_SIZE;
        int oplen, size;
@@ -734,50 +731,51 @@ static void DhcpOptionsProcess (uchar * popt, Bootp_t *bp)
                oplen = *(popt + 1);
                switch (*popt) {
                case 1:
-                       NetCopyIP (&NetOurSubnetMask, (popt + 2));
+                       NetCopyIP(&NetOurSubnetMask, (popt + 2));
                        break;
 #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET)
                case 2:         /* Time offset  */
                        to_ptr = &NetTimeOffset;
-                       NetCopyLong ((ulong *)to_ptr, (ulong *)(popt + 2));
-                       NetTimeOffset = ntohl (NetTimeOffset);
+                       NetCopyLong((ulong *)to_ptr, (ulong *)(popt + 2));
+                       NetTimeOffset = ntohl(NetTimeOffset);
                        break;
 #endif
                case 3:
-                       NetCopyIP (&NetOurGatewayIP, (popt + 2));
+                       NetCopyIP(&NetOurGatewayIP, (popt + 2));
                        break;
                case 6:
-                       NetCopyIP (&NetOurDNSIP, (popt + 2));
+                       NetCopyIP(&NetOurDNSIP, (popt + 2));
 #if defined(CONFIG_BOOTP_DNS2)
-                       if (*(popt + 1) > 4) {
-                               NetCopyIP (&NetOurDNS2IP, (popt + 2 + 4));
-                       }
+                       if (*(popt + 1) > 4)
+                               NetCopyIP(&NetOurDNS2IP, (popt + 2 + 4));
 #endif
                        break;
                case 12:
-                       size = truncate_sz ("Host Name", sizeof (NetOurHostName), oplen);
-                       memcpy (&NetOurHostName, popt + 2, size);
+                       size = truncate_sz("Host Name",
+                               sizeof(NetOurHostName), oplen);
+                       memcpy(&NetOurHostName, popt + 2, size);
                        NetOurHostName[size] = 0;
                        break;
                case 15:        /* Ignore Domain Name Option */
                        break;
                case 17:
-                       size = truncate_sz ("Root Path", sizeof (NetOurRootPath), oplen);
-                       memcpy (&NetOurRootPath, popt + 2, size);
+                       size = truncate_sz("Root Path",
+                               sizeof(NetOurRootPath), oplen);
+                       memcpy(&NetOurRootPath, popt + 2, size);
                        NetOurRootPath[size] = 0;
                        break;
 #if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_NTPSERVER)
                case 42:        /* NTP server IP */
-                       NetCopyIP (&NetNtpServerIP, (popt + 2));
+                       NetCopyIP(&NetNtpServerIP, (popt + 2));
                        break;
 #endif
                case 51:
-                       NetCopyLong (&dhcp_leasetime, (ulong *) (popt + 2));
+                       NetCopyLong(&dhcp_leasetime, (ulong *) (popt + 2));
                        break;
                case 53:        /* Ignore Message Type Option */
                        break;
                case 54:
-                       NetCopyIP (&NetDHCPServerIP, (popt + 2));
+                       NetCopyIP(&NetDHCPServerIP, (popt + 2));
                        break;
                case 58:        /* Ignore Renewal Time Option */
                        break;
@@ -792,7 +790,7 @@ static void DhcpOptionsProcess (uchar * popt, Bootp_t *bp)
                         * pass the bootp packet pointer into here as the
                         * second arg
                         */
-                       size = truncate_sz ("Opt Boot File",
+                       size = truncate_sz("Opt Boot File",
                                            sizeof(bp->bp_file),
                                            oplen);
                        if (bp->bp_file[0] == '\0' && size > 0) {
@@ -813,10 +811,11 @@ static void DhcpOptionsProcess (uchar * popt, Bootp_t *bp)
                        break;
                default:
 #if defined(CONFIG_BOOTP_VENDOREX)
-                       if (dhcp_vendorex_proc (popt))
+                       if (dhcp_vendorex_proc(popt))
                                break;
 #endif
-                       printf ("*** Unhandled DHCP Option in OFFER/ACK: %d\n", *popt);
+                       printf("*** Unhandled DHCP Option in OFFER/ACK:"
+                               " %d\n", *popt);
                        break;
                }
                popt += oplen + 2;      /* Process next option */
@@ -825,42 +824,42 @@ static void DhcpOptionsProcess (uchar * popt, Bootp_t *bp)
 
 static int DhcpMessageType(unsigned char *popt)
 {
-       if (NetReadLong((ulong*)popt) != htonl(BOOTP_VENDOR_MAGIC))
+       if (NetReadLong((ulong *)popt) != htonl(BOOTP_VENDOR_MAGIC))
                return -1;
 
        popt += 4;
-       while ( *popt != 0xff ) {
-               if ( *popt == 53 )      /* DHCP Message Type */
+       while (*popt != 0xff) {
+               if (*popt == 53)        /* DHCP Message Type */
                        return *(popt + 2);
                popt += *(popt + 1) + 2;        /* Scan through all options */
        }
        return -1;
 }
 
-static void DhcpSendRequestPkt(Bootp_t *bp_offer)
+static void DhcpSendRequestPkt(struct Bootp_t *bp_offer)
 {
        uchar *pkt, *iphdr;
-       Bootp_t *bp;
+       struct Bootp_t *bp;
        int pktlen, iplen, extlen;
        IPaddr_t OfferedIP;
 
        debug("DhcpSendRequestPkt: Sending DHCPREQUEST\n");
        pkt = NetTxPacket;
-       memset ((void*)pkt, 0, PKTSIZE);
+       memset((void *)pkt, 0, PKTSIZE);
 
        pkt += NetSetEther(pkt, NetBcastAddr, PROT_IP);
 
-       iphdr = pkt;            /* We'll need this later to set proper pkt size */
+       iphdr = pkt;    /* We'll need this later to set proper pkt size */
        pkt += IP_HDR_SIZE;
 
-       bp = (Bootp_t *)pkt;
+       bp = (struct Bootp_t *)pkt;
        bp->bp_op = OP_BOOTREQUEST;
        bp->bp_htype = HWT_ETHER;
        bp->bp_hlen = HWL_ETHER;
        bp->bp_hops = 0;
        bp->bp_secs = htons(get_timer(0) / 1000);
-       /* Do not set the client IP, your IP, or server IP yet, since it hasn't been ACK'ed by
-        * the server yet */
+       /* Do not set the client IP, your IP, or server IP yet, since it
+        * hasn't been ACK'ed by the server yet */
 
        /*
         * RFC3046 requires Relay Agents to discard packets with
@@ -868,7 +867,7 @@ static void DhcpSendRequestPkt(Bootp_t *bp_offer)
         */
        NetWriteIP(&bp->bp_giaddr, 0);
 
-       memcpy (bp->bp_chaddr, NetOurEther, 6);
+       memcpy(bp->bp_chaddr, NetOurEther, 6);
 
        /*
         * ID is the id of the OFFER packet
@@ -882,9 +881,11 @@ static void DhcpSendRequestPkt(Bootp_t *bp_offer)
 
        /* Copy offered IP into the parameters request list */
        NetCopyIP(&OfferedIP, &bp_offer->bp_yiaddr);
-       extlen = DhcpExtended((u8 *)bp->bp_vend, DHCP_REQUEST, NetDHCPServerIP, OfferedIP);
+       extlen = DhcpExtended((u8 *)bp->bp_vend, DHCP_REQUEST,
+               NetDHCPServerIP, OfferedIP);
 
-       pktlen = ((int)(pkt-NetTxPacket)) + BOOTP_HDR_SIZE - sizeof(bp->bp_vend) + extlen;
+       pktlen = ((int)(pkt-NetTxPacket)) + BOOTP_HDR_SIZE -
+               sizeof(bp->bp_vend) + extlen;
        iplen = BOOTP_HDR_SIZE - sizeof(bp->bp_vend) + extlen;
        NetSetIP(iphdr, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, iplen);
 
@@ -902,36 +903,38 @@ static void
 DhcpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
            unsigned len)
 {
-       Bootp_t *bp = (Bootp_t *)pkt;
+       struct Bootp_t *bp = (struct Bootp_t *)pkt;
 
        debug("DHCPHandler: got packet: (src=%d, dst=%d, len=%d) state: %d\n",
                src, dest, len, dhcp_state);
 
-       if (BootpCheckPkt(pkt, dest, src, len)) /* Filter out pkts we don't want */
+       /* Filter out pkts we don't want */
+       if (BootpCheckPkt(pkt, dest, src, len))
                return;
 
-       debug("DHCPHandler: got DHCP packet: (src=%d, dst=%d, len=%d) state: %d\n",
-               src, dest, len, dhcp_state);
+       debug("DHCPHandler: got DHCP packet: (src=%d, dst=%d, len=%d) state:"
+               " %d\n", src, dest, len, dhcp_state);
 
        switch (dhcp_state) {
        case SELECTING:
                /*
                 * Wait an appropriate time for any potential DHCPOFFER packets
-                * to arrive.  Then select one, and generate DHCPREQUEST response.
-                * If filename is in format we recognize, assume it is a valid
-                * OFFER from a server we want.
+                * to arrive.  Then select one, and generate DHCPREQUEST
+                * response.  If filename is in format we recognize, assume it
+                * is a valid OFFER from a server we want.
                 */
                debug("DHCP: state=SELECTING bp_file: \"%s\"\n", bp->bp_file);
 #ifdef CONFIG_SYS_BOOTFILE_PREFIX
                if (strncmp(bp->bp_file,
                            CONFIG_SYS_BOOTFILE_PREFIX,
-                           strlen(CONFIG_SYS_BOOTFILE_PREFIX)) == 0 ) {
+                           strlen(CONFIG_SYS_BOOTFILE_PREFIX)) == 0) {
 #endif /* CONFIG_SYS_BOOTFILE_PREFIX */
 
                        debug("TRANSITIONING TO REQUESTING STATE\n");
                        dhcp_state = REQUESTING;
 
-                       if (NetReadLong((ulong*)&bp->bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC))
+                       if (NetReadLong((ulong *)&bp->bp_vend[0]) ==
+                                               htonl(BOOTP_VENDOR_MAGIC))
                                DhcpOptionsProcess((u8 *)&bp->bp_vend[4], bp);
 
                        NetSetTimeout(TIMEOUT, BootpTimeout);
@@ -945,14 +948,17 @@ DhcpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
        case REQUESTING:
                debug("DHCP State: REQUESTING\n");
 
-               if ( DhcpMessageType((u8 *)bp->bp_vend) == DHCP_ACK ) {
-                       if (NetReadLong((ulong*)&bp->bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC))
+               if (DhcpMessageType((u8 *)bp->bp_vend) == DHCP_ACK) {
+                       if (NetReadLong((ulong *)&bp->bp_vend[0]) ==
+                                               htonl(BOOTP_VENDOR_MAGIC))
                                DhcpOptionsProcess((u8 *)&bp->bp_vend[4], bp);
-                       BootpCopyNetParams(bp); /* Store net params from reply */
+                       /* Store net params from reply */
+                       BootpCopyNetParams(bp);
                        dhcp_state = BOUND;
-                       printf ("DHCP client bound to address %pI4\n", &NetOurIP);
+                       printf("DHCP client bound to address %pI4\n",
+                               &NetOurIP);
                        bootstage_mark_name(BOOTSTAGE_ID_BOOTP_STOP,
-                                           "bootp_stop");
+                               "bootp_stop");
 
                        net_auto_load();
                        return;
@@ -962,7 +968,7 @@ DhcpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,
                /* DHCP client bound to address */
                break;
        default:
-               puts ("DHCP: INVALID STATE\n");
+               puts("DHCP: INVALID STATE\n");
                break;
        }
 
index 50625abea1839e6ecff7d04c8137a3ab6ca64c32..ce7373454eedd9ec1f82bb3e0586d38a8e90a4e2 100644 (file)
@@ -10,7 +10,7 @@
 #define __BOOTP_H__
 
 #ifndef __NET_H__
-#include       <net.h>
+#include <net.h>
 #endif /* __NET_H__ */
 
 /**********************************************************************/
  *     BOOTP header.
  */
 #if defined(CONFIG_CMD_DHCP)
-#define OPT_SIZE 312   /* Minimum DHCP Options size per RFC2131 - results in 576 byte pkt */
+/* Minimum DHCP Options size per RFC2131 - results in 576 byte pkt */
+#define OPT_SIZE 312
+#if defined(CONFIG_BOOTP_VENDOREX)
+extern u8 *dhcp_vendorex_prep(u8 *e); /*rtn new e after add own opts. */
+extern u8 *dhcp_vendorex_proc(u8 *e); /*rtn next e if mine,else NULL  */
+#endif
 #else
 #define OPT_SIZE 64
 #endif
 
-typedef struct
-{
-       uchar           bp_op;          /* Operation                            */
+struct Bootp_t {
+       uchar           bp_op;          /* Operation                    */
 # define OP_BOOTREQUEST        1
 # define OP_BOOTREPLY  2
-       uchar           bp_htype;       /* Hardware type                        */
+       uchar           bp_htype;       /* Hardware type                */
 # define HWT_ETHER     1
-       uchar           bp_hlen;        /* Hardware address length              */
+       uchar           bp_hlen;        /* Hardware address length      */
 # define HWL_ETHER     6
-       uchar           bp_hops;        /* Hop count (gateway thing)            */
-       ulong           bp_id;          /* Transaction ID                       */
-       ushort          bp_secs;        /* Seconds since boot                   */
-       ushort          bp_spare1;      /* Alignment                            */
-       IPaddr_t        bp_ciaddr;      /* Client IP address                    */
-       IPaddr_t        bp_yiaddr;      /* Your (client) IP address             */
-       IPaddr_t        bp_siaddr;      /* Server IP address                    */
-       IPaddr_t        bp_giaddr;      /* Gateway IP address                   */
-       uchar           bp_chaddr[16];  /* Client hardware address              */
-       char            bp_sname[64];   /* Server host name                     */
-       char            bp_file[128];   /* Boot file name                       */
-       char            bp_vend[OPT_SIZE];      /* Vendor information                   */
-}      Bootp_t;
-
-#define BOOTP_HDR_SIZE sizeof (Bootp_t)
+       uchar           bp_hops;        /* Hop count (gateway thing)    */
+       ulong           bp_id;          /* Transaction ID               */
+       ushort          bp_secs;        /* Seconds since boot           */
+       ushort          bp_spare1;      /* Alignment                    */
+       IPaddr_t        bp_ciaddr;      /* Client IP address            */
+       IPaddr_t        bp_yiaddr;      /* Your (client) IP address     */
+       IPaddr_t        bp_siaddr;      /* Server IP address            */
+       IPaddr_t        bp_giaddr;      /* Gateway IP address           */
+       uchar           bp_chaddr[16];  /* Client hardware address      */
+       char            bp_sname[64];   /* Server host name             */
+       char            bp_file[128];   /* Boot file name               */
+       char            bp_vend[OPT_SIZE];      /* Vendor information   */
+};
+
+#define BOOTP_HDR_SIZE sizeof(struct Bootp_t)
 #define BOOTP_SIZE     (ETHER_HDR_SIZE + IP_HDR_SIZE + BOOTP_HDR_SIZE)
 
 /**********************************************************************/
@@ -56,16 +60,16 @@ typedef struct
  */
 
 /* bootp.c */
-extern ulong   BootpID;                /* ID of cur BOOTP request              */
-extern char    BootFile[128];          /* Boot file name                       */
+extern ulong   BootpID;                /* ID of cur BOOTP request      */
+extern char    BootFile[128];          /* Boot file name               */
 extern int     BootpTry;
 #ifdef CONFIG_BOOTP_RANDOM_DELAY
-extern ulong   seed1, seed2;           /* seed for random BOOTP delay          */
+extern ulong   seed1, seed2;           /* seed for random BOOTP delay  */
 #endif
 
 
 /* Send a BOOTP request */
-extern void    BootpRequest (void);
+extern void BootpRequest(void);
 
 /****************** DHCP Support *********************/
 extern void DhcpRequest(void);