summaryrefslogtreecommitdiffstats
path: root/net/net.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-04-10 19:09:21 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-04-12 09:54:56 +0200
commitc75ab7876339bbe9c3987bc426cf60ff9b2d03f0 (patch)
tree88d1083ad07c6f1f3fcd9666b93ff8d0006ca3a2 /net/net.c
parentdcf5df122fe20daecbd7c2ba1640e9064d73fa4b (diff)
downloadbarebox-c75ab7876339bbe9c3987bc426cf60ff9b2d03f0.tar.gz
barebox-c75ab7876339bbe9c3987bc426cf60ff9b2d03f0.tar.xz
net: add a context to the packet handler
This is not yet used, but with this the different network commands can get rid of their global data. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'net/net.c')
-rw-r--r--net/net.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/net/net.c b/net/net.c
index 7495357141..f1ab667b35 100644
--- a/net/net.c
+++ b/net/net.c
@@ -343,7 +343,8 @@ void net_set_gateway(IPaddr_t gw)
static LIST_HEAD(connection_list);
-static struct net_connection *net_new(IPaddr_t dest, rx_handler_f *handler)
+static struct net_connection *net_new(IPaddr_t dest, rx_handler_f *handler,
+ void *ctx)
{
struct eth_device *edev = eth_get_current();
struct net_connection *con;
@@ -366,6 +367,7 @@ static struct net_connection *net_new(IPaddr_t dest, rx_handler_f *handler)
con = xzalloc(sizeof(*con));
con->packet = xmemalign(32, PKTSIZE);
+ con->priv = ctx;
memset(con->packet, 0, PKTSIZE);
con->et = (struct ethernet *)con->packet;
@@ -402,9 +404,9 @@ out:
}
struct net_connection *net_udp_new(IPaddr_t dest, uint16_t dport,
- rx_handler_f *handler)
+ rx_handler_f *handler, void *ctx)
{
- struct net_connection *con = net_new(dest, handler);
+ struct net_connection *con = net_new(dest, handler, ctx);
if (IS_ERR(con))
return con;
@@ -417,9 +419,10 @@ struct net_connection *net_udp_new(IPaddr_t dest, uint16_t dport,
return con;
}
-struct net_connection *net_icmp_new(IPaddr_t dest, rx_handler_f *handler)
+struct net_connection *net_icmp_new(IPaddr_t dest, rx_handler_f *handler,
+ void *ctx)
{
- struct net_connection *con = net_new(dest, handler);
+ struct net_connection *con = net_new(dest, handler, ctx);
if (IS_ERR(con))
return con;
@@ -564,7 +567,7 @@ static int net_handle_udp(unsigned char *pkt, int len)
port = ntohs(udp->uh_dport);
list_for_each_entry(con, &connection_list, list) {
if (con->proto == IPPROTO_UDP && port == ntohs(con->udp->uh_sport)) {
- con->handler(pkt, len);
+ con->handler(con->priv, pkt, len);
return 0;
}
}
@@ -579,7 +582,7 @@ static int net_handle_icmp(unsigned char *pkt, int len)
list_for_each_entry(con, &connection_list, list) {
if (con->proto == IPPROTO_ICMP) {
- con->handler(pkt, len);
+ con->handler(con->priv, pkt, len);
return 0;
}
}