* [U-Boot] [PATCH 08/28] net: Move RARP receive logic out of net.c
@ 2014-04-12 17:17 Harsh Tailor
0 siblings, 0 replies; 4+ messages in thread
From: Harsh Tailor @ 2014-04-12 17:17 UTC (permalink / raw)
To: u-boot
Sent from my iPhone
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 08/28] net: Move RARP receive logic out of net.c
2012-01-20 0:53 ` [U-Boot] [PATCH 08/28] net: Move RARP receive logic out of net.c Joe Hershberger
2012-01-24 5:45 ` Simon Glass
@ 2012-02-03 11:59 ` Mike Frysinger
1 sibling, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2012-02-03 11:59 UTC (permalink / raw)
To: u-boot
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120203/8d8002cc/attachment.pgp>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 08/28] net: Move RARP receive logic out of net.c
2012-01-20 0:53 ` [U-Boot] [PATCH 08/28] net: Move RARP receive logic out of net.c Joe Hershberger
@ 2012-01-24 5:45 ` Simon Glass
2012-02-03 11:59 ` Mike Frysinger
1 sibling, 0 replies; 4+ messages in thread
From: Simon Glass @ 2012-01-24 5:45 UTC (permalink / raw)
To: u-boot
On Thu, Jan 19, 2012 at 4:53 PM, Joe Hershberger <joe.hershberger@ni.com> wrote:
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> Cc: Joe Hershberger <joe.hershberger@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
Acked-by: Simon Glass <sjg@chromium.org>
> ---
> ?net/net.c ?| ? 25 +------------------------
> ?net/rarp.c | ? 38 +++++++++++++++++++++++++++-----------
> ?net/rarp.h | ? ?1 +
> ?3 files changed, 29 insertions(+), 35 deletions(-)
>
> diff --git a/net/net.c b/net/net.c
> index c2fbcb5..fdc1ebe 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -857,9 +857,6 @@ NetReceive(volatile uchar *inpkt, int len)
> ?{
> ? ? ? ?Ethernet_t *et;
> ? ? ? ?IP_t ? ?*ip;
> -#ifdef CONFIG_CMD_RARP
> - ? ? ? ARP_t ? *arp;
> -#endif
> ? ? ? ?IPaddr_t tmp;
> ? ? ? ?IPaddr_t src_ip;
> ? ? ? ?int ? ? x;
> @@ -964,27 +961,7 @@ NetReceive(volatile uchar *inpkt, int len)
>
> ?#ifdef CONFIG_CMD_RARP
> ? ? ? ?case PROT_RARP:
> - ? ? ? ? ? ? ? debug("Got RARP\n");
> - ? ? ? ? ? ? ? arp = (ARP_t *)ip;
> - ? ? ? ? ? ? ? if (len < ARP_HDR_SIZE) {
> - ? ? ? ? ? ? ? ? ? ? ? printf("bad length %d < %d\n", len, ARP_HDR_SIZE);
> - ? ? ? ? ? ? ? ? ? ? ? return;
> - ? ? ? ? ? ? ? }
> -
> - ? ? ? ? ? ? ? if ((ntohs(arp->ar_op) != RARPOP_REPLY) ||
> - ? ? ? ? ? ? ? ? ? ? ? (ntohs(arp->ar_hrd) != ARP_ETHER) ? ||
> - ? ? ? ? ? ? ? ? ? ? ? (ntohs(arp->ar_pro) != PROT_IP) ? ? ||
> - ? ? ? ? ? ? ? ? ? ? ? (arp->ar_hln != 6) || (arp->ar_pln != 4)) {
> -
> - ? ? ? ? ? ? ? ? ? ? ? puts("invalid RARP header\n");
> - ? ? ? ? ? ? ? } else {
> - ? ? ? ? ? ? ? ? ? ? ? NetCopyIP(&NetOurIP, &arp->ar_data[16]);
> - ? ? ? ? ? ? ? ? ? ? ? if (NetServerIP == 0)
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? NetCopyIP(&NetServerIP, &arp->ar_data[6]);
> - ? ? ? ? ? ? ? ? ? ? ? memcpy(NetServerEther, &arp->ar_data[0], 6);
> -
> - ? ? ? ? ? ? ? ? ? ? ? (*packetHandler)(0, 0, 0, 0, 0);
> - ? ? ? ? ? ? ? }
> + ? ? ? ? ? ? ? RarpReceive(ip, len);
> ? ? ? ? ? ? ? ?break;
> ?#endif
> ? ? ? ?case PROT_IP:
> diff --git a/net/rarp.c b/net/rarp.c
> index 5a813a2..761560c 100644
> --- a/net/rarp.c
> +++ b/net/rarp.c
> @@ -36,18 +36,37 @@
> ?# define TIMEOUT_COUNT ?(CONFIG_NET_RETRY_COUNT)
> ?#endif
>
> -
> ?int ? ? ? ? ? ?RarpTry;
>
> ?/*
> ?* ? ? Handle a RARP received packet.
> ?*/
> -static void
> -RarpHandler(uchar *dummi0, unsigned dummi1, IPaddr_t sip, unsigned dummi2,
> - ? ? ? ? ? unsigned dummi3)
> +void
void on same line as function?
> +RarpReceive(IP_t *ip, unsigned len)
> ?{
> - ? ? ? debug("Got good RARP\n");
> - ? ? ? net_auto_load();
> + ? ? ? ARP_t *arp;
> +
> + ? ? ? debug("Got RARP\n");
> + ? ? ? arp = (ARP_t *)ip;
> + ? ? ? if (len < ARP_HDR_SIZE) {
> + ? ? ? ? ? ? ? printf("bad length %d < %d\n", len, ARP_HDR_SIZE);
> + ? ? ? ? ? ? ? return;
> + ? ? ? }
> +
> + ? ? ? if ((ntohs(arp->ar_op) != RARPOP_REPLY) ||
> + ? ? ? ? ? ? ? (ntohs(arp->ar_hrd) != ARP_ETHER) ? ||
> + ? ? ? ? ? ? ? (ntohs(arp->ar_pro) != PROT_IP) ? ? ||
> + ? ? ? ? ? ? ? (arp->ar_hln != 6) || (arp->ar_pln != 4)) {
> +
> + ? ? ? ? ? ? ? puts("invalid RARP header\n");
> + ? ? ? } else {
> + ? ? ? ? ? ? ? NetCopyIP(&NetOurIP, &arp->ar_data[16]);
> + ? ? ? ? ? ? ? if (NetServerIP == 0)
> + ? ? ? ? ? ? ? ? ? ? ? NetCopyIP(&NetServerIP, &arp->ar_data[6]);
> + ? ? ? ? ? ? ? memcpy(NetServerEther, &arp->ar_data[0], 6);
> + ? ? ? ? ? ? ? debug("Got good RARP\n");
> + ? ? ? ? ? ? ? net_auto_load();
> + ? ? ? }
> ?}
>
>
> @@ -70,7 +89,6 @@ RarpTimeout(void)
> ?void
> ?RarpRequest(void)
> ?{
> - ? ? ? int i;
> ? ? ? ?uchar *pkt;
> ? ? ? ?ARP_t *rarp;
>
> @@ -90,12 +108,10 @@ RarpRequest(void)
> ? ? ? ?memcpy(&rarp->ar_data[6], ?&NetOurIP, ? 4); ? ? /* source IP addr */
> ? ? ? ?/* dest ET addr = source ET addr ??*/
> ? ? ? ?memcpy(&rarp->ar_data[10], NetOurEther, 6);
> - ? ? ? /* dest. IP addr set to broadcast */
> - ? ? ? for (i = 0; i <= 3; i++)
> - ? ? ? ? ? ? ? rarp->ar_data[16 + i] = 0xff;
> + ? ? ? /* dest IP addr set to broadcast */
> + ? ? ? memset(&rarp->ar_data[16], 0xff, ? ? ? ?4);
>
> ? ? ? ?NetSendPacket(NetTxPacket, (pkt - NetTxPacket) + ARP_HDR_SIZE);
>
> ? ? ? ?NetSetTimeout(TIMEOUT, RarpTimeout);
> - ? ? ? NetSetHandler(RarpHandler);
> ?}
> diff --git a/net/rarp.h b/net/rarp.h
> index 4e92d80..0d728dc 100644
> --- a/net/rarp.h
> +++ b/net/rarp.h
> @@ -37,6 +37,7 @@
>
> ?extern int RarpTry;
>
> +extern void RarpReceive(IP_t *ip, unsigned len);
> ?extern void RarpRequest(void); /* Send a RARP request */
>
> ?/**********************************************************************/
> --
> 1.6.0.2
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH 08/28] net: Move RARP receive logic out of net.c
2012-01-20 0:53 [U-Boot] [PATCH 00/28] Add link-local addressing support Joe Hershberger
@ 2012-01-20 0:53 ` Joe Hershberger
2012-01-24 5:45 ` Simon Glass
2012-02-03 11:59 ` Mike Frysinger
0 siblings, 2 replies; 4+ messages in thread
From: Joe Hershberger @ 2012-01-20 0:53 UTC (permalink / raw)
To: u-boot
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
---
net/net.c | 25 +------------------------
net/rarp.c | 38 +++++++++++++++++++++++++++-----------
net/rarp.h | 1 +
3 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/net/net.c b/net/net.c
index c2fbcb5..fdc1ebe 100644
--- a/net/net.c
+++ b/net/net.c
@@ -857,9 +857,6 @@ NetReceive(volatile uchar *inpkt, int len)
{
Ethernet_t *et;
IP_t *ip;
-#ifdef CONFIG_CMD_RARP
- ARP_t *arp;
-#endif
IPaddr_t tmp;
IPaddr_t src_ip;
int x;
@@ -964,27 +961,7 @@ NetReceive(volatile uchar *inpkt, int len)
#ifdef CONFIG_CMD_RARP
case PROT_RARP:
- debug("Got RARP\n");
- arp = (ARP_t *)ip;
- if (len < ARP_HDR_SIZE) {
- printf("bad length %d < %d\n", len, ARP_HDR_SIZE);
- return;
- }
-
- if ((ntohs(arp->ar_op) != RARPOP_REPLY) ||
- (ntohs(arp->ar_hrd) != ARP_ETHER) ||
- (ntohs(arp->ar_pro) != PROT_IP) ||
- (arp->ar_hln != 6) || (arp->ar_pln != 4)) {
-
- puts("invalid RARP header\n");
- } else {
- NetCopyIP(&NetOurIP, &arp->ar_data[16]);
- if (NetServerIP == 0)
- NetCopyIP(&NetServerIP, &arp->ar_data[6]);
- memcpy(NetServerEther, &arp->ar_data[0], 6);
-
- (*packetHandler)(0, 0, 0, 0, 0);
- }
+ RarpReceive(ip, len);
break;
#endif
case PROT_IP:
diff --git a/net/rarp.c b/net/rarp.c
index 5a813a2..761560c 100644
--- a/net/rarp.c
+++ b/net/rarp.c
@@ -36,18 +36,37 @@
# define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT)
#endif
-
int RarpTry;
/*
* Handle a RARP received packet.
*/
-static void
-RarpHandler(uchar *dummi0, unsigned dummi1, IPaddr_t sip, unsigned dummi2,
- unsigned dummi3)
+void
+RarpReceive(IP_t *ip, unsigned len)
{
- debug("Got good RARP\n");
- net_auto_load();
+ ARP_t *arp;
+
+ debug("Got RARP\n");
+ arp = (ARP_t *)ip;
+ if (len < ARP_HDR_SIZE) {
+ printf("bad length %d < %d\n", len, ARP_HDR_SIZE);
+ return;
+ }
+
+ if ((ntohs(arp->ar_op) != RARPOP_REPLY) ||
+ (ntohs(arp->ar_hrd) != ARP_ETHER) ||
+ (ntohs(arp->ar_pro) != PROT_IP) ||
+ (arp->ar_hln != 6) || (arp->ar_pln != 4)) {
+
+ puts("invalid RARP header\n");
+ } else {
+ NetCopyIP(&NetOurIP, &arp->ar_data[16]);
+ if (NetServerIP == 0)
+ NetCopyIP(&NetServerIP, &arp->ar_data[6]);
+ memcpy(NetServerEther, &arp->ar_data[0], 6);
+ debug("Got good RARP\n");
+ net_auto_load();
+ }
}
@@ -70,7 +89,6 @@ RarpTimeout(void)
void
RarpRequest(void)
{
- int i;
uchar *pkt;
ARP_t *rarp;
@@ -90,12 +108,10 @@ RarpRequest(void)
memcpy(&rarp->ar_data[6], &NetOurIP, 4); /* source IP addr */
/* dest ET addr = source ET addr ??*/
memcpy(&rarp->ar_data[10], NetOurEther, 6);
- /* dest. IP addr set to broadcast */
- for (i = 0; i <= 3; i++)
- rarp->ar_data[16 + i] = 0xff;
+ /* dest IP addr set to broadcast */
+ memset(&rarp->ar_data[16], 0xff, 4);
NetSendPacket(NetTxPacket, (pkt - NetTxPacket) + ARP_HDR_SIZE);
NetSetTimeout(TIMEOUT, RarpTimeout);
- NetSetHandler(RarpHandler);
}
diff --git a/net/rarp.h b/net/rarp.h
index 4e92d80..0d728dc 100644
--- a/net/rarp.h
+++ b/net/rarp.h
@@ -37,6 +37,7 @@
extern int RarpTry;
+extern void RarpReceive(IP_t *ip, unsigned len);
extern void RarpRequest(void); /* Send a RARP request */
/**********************************************************************/
--
1.6.0.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-04-12 17:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-12 17:17 [U-Boot] [PATCH 08/28] net: Move RARP receive logic out of net.c Harsh Tailor
-- strict thread matches above, loose matches on Subject: below --
2012-01-20 0:53 [U-Boot] [PATCH 00/28] Add link-local addressing support Joe Hershberger
2012-01-20 0:53 ` [U-Boot] [PATCH 08/28] net: Move RARP receive logic out of net.c Joe Hershberger
2012-01-24 5:45 ` Simon Glass
2012-02-03 11:59 ` Mike Frysinger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.