vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Restructurisations, cleanups and few bugfixes

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-07-02 22:13:33 +02:00
parent c4d038f632
commit 7e0c2d162a
6 changed files with 251 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

65
grub-core/net/udp.c
View file

@ -4,6 +4,46 @@
#include <grub/net/netbuff.h>
#include <grub/time.h>
grub_net_socket_t
grub_net_udp_open (char *server,
grub_uint16_t out_port,
grub_err_t (*recv_hook) (grub_net_socket_t sock,
struct grub_net_buff *nb,
void *data),
void *recv_hook_data)
{
grub_err_t err;
grub_net_network_level_address_t addr;
struct grub_net_network_level_interface *inf;
grub_net_network_level_address_t gateway;
grub_net_socket_t socket;
static int in_port = 25300;
err = grub_net_resolve_address (server, &addr);
if (err)
return NULL;
err = grub_net_route_address (addr, &gateway, &inf);
if (err)
return NULL;
socket = grub_zalloc (sizeof (*socket));
if (socket == NULL)
return NULL;
socket->x_out_port = out_port;
socket->x_inf = inf;
socket->x_out_nla = addr;
socket->x_in_port = in_port++;
socket->x_status = GRUB_NET_SOCKET_START;
socket->recv_hook = recv_hook;
socket->recv_hook_data = recv_hook_data;
grub_net_socket_register (socket);
return socket;
}
grub_err_t
grub_net_send_udp_packet (const grub_net_socket_t socket,
struct grub_net_buff *nb)
@ -16,14 +56,14 @@ grub_net_send_udp_packet (const grub_net_socket_t socket,
return err;
udph = (struct udphdr *) nb->data;
udph->src = grub_cpu_to_be16 (socket->in_port);
udph->dst = grub_cpu_to_be16 (socket->out_port);
udph->src = grub_cpu_to_be16 (socket->x_in_port);
udph->dst = grub_cpu_to_be16 (socket->x_out_port);
/* No chechksum. */
udph->chksum = 0;
udph->len = grub_cpu_to_be16 (nb->tail - nb->data);
return grub_net_send_ip_packet (socket->inf, &(socket->out_nla), nb);
return grub_net_send_ip_packet (socket->x_inf, &(socket->x_out_nla), nb);
}
grub_err_t
@ -40,20 +80,17 @@ grub_net_recv_udp_packet (struct grub_net_buff * nb,
FOR_NET_SOCKETS (sock)
{
if (grub_be_to_cpu16 (udph->dst) == sock->in_port
&& inf == sock->inf && sock->app)
if (grub_be_to_cpu16 (udph->dst) == sock->x_in_port
&& inf == sock->x_inf && sock->recv_hook)
{
if (sock->status == 0)
sock->out_port = grub_be_to_cpu16 (udph->src);
if (sock->x_status == GRUB_NET_SOCKET_START)
{
sock->x_out_port = grub_be_to_cpu16 (udph->src);
sock->x_status = GRUB_NET_SOCKET_ESTABLISHED;
}
/* App protocol remove its own reader. */
sock->app->read (sock, nb);
/* If there is data, puts packet in socket list. */
if ((nb->tail - nb->data) > 0)
grub_net_put_packet (&sock->packs, nb);
else
grub_netbuff_free (nb);
sock->recv_hook (sock, nb, sock->recv_hook_data);
return GRUB_ERR_NONE;
}
}