sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/net'

This commit is contained in:
Sascha Hauer 2015-07-03 08:37:54 +02:00
parent 45019dc10b 8bbc1064c7
commit c408a4ecbe
2 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
fs/tftp.c
View File

@ -253,27 +253,24 @@ static void tftp_timer_reset(struct file_priv *priv)
priv->progress_timeout = priv->resend_timeout = get_time_ns();
}
static void tftp_handler(void *ctx, char *packet, unsigned len)
static void tftp_recv(struct file_priv *priv,
uint8_t *pkt, unsigned len, uint16_t uh_sport)
{
struct file_priv *priv = ctx;
uint16_t proto;
uint16_t *s;
char *pkt = net_eth_to_udp_payload(packet);
struct udphdr *udp = net_eth_to_udphdr(packet);
uint16_t opcode;
len = net_eth_to_udplen(packet);
if (len < 2)
/* according to RFC1350 minimal tftp packet length is 4 bytes */
if (len < 4)
return;
opcode = ntohs(*(uint16_t *)pkt);
/* skip tftp opcode 2-byte field */
len -= 2;
pkt += 2;
s = (uint16_t *)pkt;
proto = *s++;
pkt = (unsigned char *)s;
debug("%s: opcode 0x%04x\n", __func__, opcode);
debug("%s: proto 0x%04x\n", __func__, proto);
switch (ntohs(proto)) {
switch (opcode) {
case TFTP_RRQ:
case TFTP_WRQ:
default:
@ -296,14 +293,14 @@ static void tftp_handler(void *ctx, char *packet, unsigned len)
priv->state = STATE_DONE;
break;
}
priv->tftp_con->udp->uh_dport = udp->uh_sport;
priv->tftp_con->udp->uh_dport = uh_sport;
priv->state = STATE_WDATA;
break;
case TFTP_OACK:
tftp_parse_oack(priv, pkt, len);
priv->server_port = ntohs(udp->uh_sport);
priv->tftp_con->udp->uh_dport = udp->uh_sport;
priv->server_port = ntohs(uh_sport);
priv->tftp_con->udp->uh_dport = uh_sport;
if (priv->push) {
/* send first block */
@ -318,16 +315,14 @@ static void tftp_handler(void *ctx, char *packet, unsigned len)
break;
case TFTP_DATA:
if (len < 2)
return;
len -= 2;
priv->block = ntohs(*(uint16_t *)pkt);
if (priv->state == STATE_RRQ || priv->state == STATE_OACK) {
/* first block received */
priv->state = STATE_RDATA;
priv->tftp_con->udp->uh_dport = udp->uh_sport;
priv->server_port = ntohs(udp->uh_sport);
priv->tftp_con->udp->uh_dport = uh_sport;
priv->server_port = ntohs(uh_sport);
priv->last_block = 0;
if (priv->block != 1) { /* Assertion */
@ -376,6 +371,16 @@ static void tftp_handler(void *ctx, char *packet, unsigned len)
}
}
static void tftp_handler(void *ctx, char *packet, unsigned len)
{
struct file_priv *priv = ctx;
char *pkt = net_eth_to_udp_payload(packet);
struct udphdr *udp = net_eth_to_udphdr(packet);
(void)len;
tftp_recv(priv, pkt, net_eth_to_udplen(packet), udp->uh_sport);
}
static struct file_priv *tftp_do_open(struct device_d *dev,
int accmode, const char *filename)
{

13
net/dns.c
View File

@ -116,9 +116,8 @@ static int dns_send(char *name)
return ret;
}
static void dns_handler(void *ctx, char *packet, unsigned len)
static void dns_recv(struct header *header, unsigned len)
{
struct header *header;
unsigned char *p, *e, *s;
u16 type;
int found, stop, dlen;
@ -127,7 +126,6 @@ static void dns_handler(void *ctx, char *packet, unsigned len)
debug("%s\n", __func__);
/* We sent 1 query. We want to see more that 1 answer. */
header = (struct header *)net_eth_to_udp_payload(packet);
if (ntohs(header->nqueries) != 1)
return;
@ -140,7 +138,7 @@ static void dns_handler(void *ctx, char *packet, unsigned len)
/* Skip host name */
s = &header->data[0];
e = packet + len;
e = ((uint8_t *)header) + len;
for (p = s; p < e && *p != '\0'; p++)
continue;
@ -194,6 +192,13 @@ static void dns_handler(void *ctx, char *packet, unsigned len)
}
}
static void dns_handler(void *ctx, char *packet, unsigned len)
{
(void)ctx;
dns_recv((struct header *)net_eth_to_udp_payload(packet),
net_eth_to_udplen(packet));
}
IPaddr_t resolv(char *host)
{
IPaddr_t ip;