if (bootme_ip == 0) {
bip = getenv("bootmeip");
if (bip) {
- bootme_ip = getenv_IPaddr("bootmeip");
+ bootme_ip = getenv_ip("bootmeip");
if (!bootme_ip)
return -EINVAL;
p = strchr(bip, ':');
}
if (bootme_state == BOOTME_INIT || bootme_state == BOOTME_DEBUG_INIT) {
struct ethernet_hdr *eth = (struct ethernet_hdr *)(pkt -
- NetEthHdrSize() - IP_UDP_HDR_SIZE);
+ net_eth_hdr_size() - IP_UDP_HDR_SIZE);
memcpy(bootme_ether, eth->et_src, sizeof(bootme_ether));
printf("Target MAC address set to %pM\n", bootme_ether);
uchar *pkt;
net_set_arp_handler(bootme_wait_arp_handler);
- assert(NetTxPacket != NULL);
- pkt = (uchar *)NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE;
+ assert(net_tx_packet != NULL);
+ pkt = (uchar *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE;
memcpy(pkt, output_packet, output_packet_len);
debug("%s@%d: Sending ARP request:\n", __func__, __LINE__);
ce_dump_block(pkt, output_packet_len);
- NetSendUDPPacket(bootme_ether, bootme_ip, bootme_dst_port,
+ net_send_udp_packet(bootme_ether, bootme_ip, bootme_dst_port,
bootme_src_port, output_packet_len);
output_packet_len = 0;
}
check_net_config();
debug("%s: buf: %p len: %u from %pI4:%d to %pI4:%d\n",
- __func__, buf, len, &NetOurIP, bootme_src_port, &bootme_ip,
+ __func__, buf, len, &net_ip, bootme_src_port, &bootme_ip,
bootme_dst_port);
if (is_zero_ether_addr(bootme_ether)) {
}
}
- assert(NetTxPacket != NULL);
- pkt = (uchar *)NetTxPacket + NetEthHdrSize() + IP_UDP_HDR_SIZE;
+ assert(net_tx_packet != NULL);
+ pkt = (uchar *)net_tx_packet + net_eth_hdr_size() + IP_UDP_HDR_SIZE;
memcpy(pkt, buf, len);
- ret = NetSendUDPPacket(bootme_ether, bootme_ip, bootme_dst_port,
+ ret = net_send_udp_packet(bootme_ether, bootme_ip, bootme_dst_port,
bootme_src_port, len);
if (ret)
printf("Failed to send packet: %d\n", ret);