VirtualBox

Changeset 15407 in vbox for trunk/src/VBox/Devices


Ignore:
Timestamp:
Dec 12, 2008 10:58:37 PM (16 years ago)
Author:
vboxsync
Message:

slirp:icmp: revert 40841

Location:
trunk/src/VBox/Devices/Network/slirp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/Network/slirp/bootp.c

    r15393 r15407  
    153153        LogRel(("NAT: %s %R[IP4]\n",
    154154                rc ? "DHCP released IP address" : "Ignored DHCP release for IP address",
    155                 bp->bp_ciaddr.s_addr));
     155                &bp->bp_ciaddr));
    156156        /* This message is not to be answered in any way. */
    157157        return;
     
    245245    if (send_nak)
    246246        LogRel(("NAT: Client requested IP address %R[IP4] -- sending NAK\n",
    247                 requested_ip.s_addr));
     247                &requested_ip));
    248248    else
    249249        LogRel(("NAT: DHCP offered IP address %R[IP4]\n",
    250                 daddr.sin_addr.s_addr));
     250                &daddr.sin_addr));
    251251
    252252    if (   dhcp_msg_type == DHCPDISCOVER
  • trunk/src/VBox/Devices/Network/slirp/debug.c

    r15393 r15407  
    230230    AssertReturn(strcmp(pszType, "IP4") == 0, 0);
    231231
    232     ip = ntohl((uint32_t)(uintptr_t)pvValue);
     232    ip = ntohl(*(uint32_t*)pvValue);
    233233    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, IP4_ADDR_PRINTF_FORMAT,
    234234           IP4_ADDR_PRINTF_DECOMP(ip));
  • trunk/src/VBox/Devices/Network/slirp/ip_icmp.c

    r15393 r15407  
    219219            {
    220220                /* Should be reaplaced by hash here */
    221                 LogRel(("trying:%R[natsock] against %R[IP4]:%d lport=%d hlport=%d\n", so, faddr.s_addr, fport, lport, so->so_hlport));
     221                LogRel(("trying:%R[natsock] against %R[IP4]:%d lport=%d hlport=%d\n", so, &faddr, fport, lport, so->so_hlport));
    222222                if (   so->so_faddr.s_addr == faddr.s_addr
    223223                    && so->so_fport == fport
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette