Changeset b4edc96 in mainline for uspace/srv/net/inetsrv


Ignore:
Timestamp:
2021-08-08T09:20:20Z (4 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3e6bca8
Parents:
d5ed54b
Message:

Rename and move addr48_t to eth_addr_t

Location:
uspace/srv/net/inetsrv
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/inetsrv/addrobj.c

    rd5ed54b rb4edc96  
    3838#include <errno.h>
    3939#include <fibril_synch.h>
     40#include <inet/eth_addr.h>
    4041#include <io/log.h>
    4142#include <ipc/loc.h>
    … …  
    229230
    230231        errno_t rc;
    231         addr48_t ldest_mac;
     232        eth_addr_t ldest_mac;
    232233
    233234        switch (ldest_ver) {

  • uspace/srv/net/inetsrv/inet_link.c

    rd5ed54b rb4edc96  
    3535 */
    3636
    37 #include <stdbool.h>
    3837#include <errno.h>
    39 #include <str_error.h>
    4038#include <fibril_synch.h>
     39#include <inet/eth_addr.h>
    4140#include <inet/iplink.h>
    4241#include <io/log.h>
    4342#include <loc.h>
     43#include <stdbool.h>
    4444#include <stdlib.h>
    4545#include <str.h>
     46#include <str_error.h>
    4647#include "addrobj.h"
    4748#include "inetsrv.h"
    … …  
    5657
    5758static errno_t inet_iplink_recv(iplink_t *, iplink_recv_sdu_t *, ip_ver_t);
    58 static errno_t inet_iplink_change_addr(iplink_t *, addr48_t *);
     59static errno_t inet_iplink_change_addr(iplink_t *, eth_addr_t *);
    5960static inet_link_t *inet_link_get_by_id_locked(sysarg_t);
    6061
    … …  
    7071    { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xfe, 0, 0, 0 };
    7172
    72 static void inet_link_local_node_ip(addr48_t *mac_addr,
     73static void inet_link_local_node_ip(eth_addr_t *mac_addr,
    7374    addr128_t ip_addr)
    7475{
    … …  
    121122}
    122123
    123 static errno_t inet_iplink_change_addr(iplink_t *iplink, addr48_t *mac)
     124static errno_t inet_iplink_change_addr(iplink_t *iplink, eth_addr_t *mac)
    124125{
    125126        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_change_addr(): "
    … …  
    129130        list_foreach(inet_links, link_list, inet_link_t, ilink) {
    130131                if (ilink->sess == iplink->sess)
    131                         memcpy(&ilink->mac, mac, sizeof(addr48_t));
     132                        ilink->mac = *mac;
    132133        }
    133134
    … …  
    387388 *
    388389 */
    389 errno_t inet_link_send_dgram6(inet_link_t *ilink, addr48_t *ldest,
     390errno_t inet_link_send_dgram6(inet_link_t *ilink, eth_addr_t *ldest,
    390391    inet_dgram_t *dgram, uint8_t proto, uint8_t ttl, int df)
    391392{

  • uspace/srv/net/inetsrv/inet_link.h

    rd5ed54b rb4edc96  
    3838#define INET_LINK_H_
    3939
     40#include <inet/eth_addr.h>
    4041#include <stddef.h>
    4142#include <stdint.h>
    … …  
    4546extern errno_t inet_link_send_dgram(inet_link_t *, addr32_t,
    4647    addr32_t, inet_dgram_t *, uint8_t, uint8_t, int);
    47 extern errno_t inet_link_send_dgram6(inet_link_t *, addr48_t *, inet_dgram_t *,
     48extern errno_t inet_link_send_dgram6(inet_link_t *, eth_addr_t *, inet_dgram_t *,
    4849    uint8_t, uint8_t, int);
    4950extern inet_link_t *inet_link_get_by_id(sysarg_t);

  • uspace/srv/net/inetsrv/inetsrv.h

    rd5ed54b rb4edc96  
    11/*
    2  * Copyright (c) 2012 Jiri Svoboda
     2 * Copyright (c) 2021 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    4141#include <stdbool.h>
    4242#include <inet/addr.h>
     43#include <inet/eth_addr.h>
    4344#include <inet/iplink.h>
    4445#include <ipc/loc.h>
    … …  
    109110        iplink_t *iplink;
    110111        size_t def_mtu;
    111         addr48_t mac;
     112        eth_addr_t mac;
    112113        bool mac_valid;
    113114} inet_link_t;

  • uspace/srv/net/inetsrv/ndp.c

    rd5ed54b rb4edc96  
    11/*
     2 * Copyright (c) 2021 Jiri Svoboda
    23 * Copyright (c) 2013 Antonin Steinhauser
    34 * All rights reserved.
    … …  
    3637
    3738#include <errno.h>
     39#include <inet/eth_addr.h>
     40#include <io/log.h>
    3841#include <mem.h>
    3942#include <stdlib.h>
    40 #include <io/log.h>
    4143#include "ntrans.h"
    4244#include "addrobj.h"
    … …  
    151153 *
    152154 */
    153 errno_t ndp_translate(addr128_t src_addr, addr128_t ip_addr, addr48_t *mac_addr,
     155errno_t ndp_translate(addr128_t src_addr, addr128_t ip_addr, eth_addr_t *mac_addr,
    154156    inet_link_t *ilink)
    155157{
    … …  
    170172        addr128(src_addr, packet.sender_proto_addr);
    171173        addr128(ip_addr, packet.solicited_ip);
    172         addr48_solicited_node(ip_addr, &packet.target_hw_addr);
     174        eth_addr_solicited_node(ip_addr, &packet.target_hw_addr);
    173175        ndp_solicited_node_ip(ip_addr, packet.target_proto_addr);
    174176

  • uspace/srv/net/inetsrv/ndp.h

    rd5ed54b rb4edc96  
    11/*
     2 * Copyright (c) 2021 Jiri Svoboda
    23 * Copyright (c) 2013 Antonin Steinhauser
    34 * All rights reserved.
    … …  
    3940
    4041#include <inet/addr.h>
     42#include <inet/eth_addr.h>
    4143#include "inetsrv.h"
    4244#include "icmpv6_std.h"
    … …  
    5254        ndp_opcode_t opcode;
    5355        /** Sender hardware address */
    54         addr48_t sender_hw_addr;
     56        eth_addr_t sender_hw_addr;
    5557        /** Sender protocol address */
    5658        addr128_t sender_proto_addr;
    5759        /** Target hardware address */
    58         addr48_t target_hw_addr;
     60        eth_addr_t target_hw_addr;
    5961        /** Target protocol address */
    6062        addr128_t target_proto_addr;
    … …  
    6466
    6567extern errno_t ndp_received(inet_dgram_t *);
    66 extern errno_t ndp_translate(addr128_t, addr128_t, addr48_t *, inet_link_t *);
     68extern errno_t ndp_translate(addr128_t, addr128_t, eth_addr_t *, inet_link_t *);
    6769
    6870#endif

  • uspace/srv/net/inetsrv/ntrans.c

    rd5ed54b rb4edc96  
    11/*
     2 * Copyright (c) 2021 Jiri Svoboda
    23 * Copyright (c) 2013 Antonin Steinhauser
    34 * All rights reserved.
    … …  
    3839#include <errno.h>
    3940#include <fibril_synch.h>
     41#include <inet/eth_addr.h>
    4042#include <inet/iplink_srv.h>
    4143#include <stdlib.h>
    … …  
    7375 *
    7476 */
    75 errno_t ntrans_add(addr128_t ip_addr, addr48_t *mac_addr)
     77errno_t ntrans_add(addr128_t ip_addr, eth_addr_t *mac_addr)
    7678{
    7779        inet_ntrans_t *ntrans;
    … …  
    134136 *
    135137 */
    136 errno_t ntrans_lookup(addr128_t ip_addr, addr48_t *mac_addr)
     138errno_t ntrans_lookup(addr128_t ip_addr, eth_addr_t *mac_addr)
    137139{
    138140        fibril_mutex_lock(&ntrans_list_lock);

  • uspace/srv/net/inetsrv/ntrans.h

    rd5ed54b rb4edc96  
    11/*
     2 * Copyright (c) 2021 Jiri Svoboda
    23 * Copyright (c) 2013 Antonin Steinhauser
    34 * All rights reserved.
    … …  
    3839#define NTRANS_H_
    3940
     41#include <inet/addr.h>
     42#include <inet/eth_addr.h>
    4043#include <inet/iplink_srv.h>
    41 #include <inet/addr.h>
    4244
    4345/** Address translation table element */
    … …  
    4547        link_t ntrans_list;
    4648        addr128_t ip_addr;
    47         addr48_t mac_addr;
     49        eth_addr_t mac_addr;
    4850} inet_ntrans_t;
    4951
    50 extern errno_t ntrans_add(addr128_t, addr48_t *);
     52extern errno_t ntrans_add(addr128_t, eth_addr_t *);
    5153extern errno_t ntrans_remove(addr128_t);
    52 extern errno_t ntrans_lookup(addr128_t, addr48_t *);
     54extern errno_t ntrans_lookup(addr128_t, eth_addr_t *);
    5355extern errno_t ntrans_wait_timeout(usec_t);
    5456

  • uspace/srv/net/inetsrv/pdu.c

    rd5ed54b rb4edc96  
    505505
    506506        message->length = 1;
    507         mac48_encode(&ndp->sender_hw_addr, message->mac);
     507        eth_addr_encode(&ndp->sender_hw_addr, message->mac);
    508508
    509509        icmpv6_phdr_t phdr;
    … …  
    553553
    554554        addr128_t_be2host(message->target_address, ndp->target_proto_addr);
    555         mac48_decode(message->mac, &ndp->sender_hw_addr);
     555        eth_addr_decode(message->mac, &ndp->sender_hw_addr);
    556556
    557557        return EOK;
Note: See TracChangeset for help on using the changeset viewer.