Changeset b4edc96 in mainline for uspace/lib/inet/include


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/lib/inet/include
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/inet/include/inet/addr.h

    rd5ed54b rb4edc96  
    3737
    3838#include <errno.h>
     39#include <inet/eth_addr.h>
    3940#include <stdint.h>
    4041
    4142typedef uint32_t addr32_t;
    42 
    43 #define ETH_ADDR_SIZE 6
    44 
    45 typedef struct {
    46         uint8_t b[ETH_ADDR_SIZE];
    47 } addr48_t;
    4843
    4944typedef uint8_t addr128_t[16];
    … …  
    8479
    8580extern const addr32_t addr32_broadcast_all_hosts;
    86 extern const addr48_t addr48_broadcast;
    8781
    8882extern void addr128(const addr128_t, addr128_t);
    8983
    90 extern int addr48_compare(const addr48_t *, const addr48_t *);
    9184extern int addr128_compare(const addr128_t, const addr128_t);
    92 
    93 extern void addr48_solicited_node(const addr128_t, addr48_t *);
     85extern void eth_addr_solicited_node(const addr128_t, eth_addr_t *);
    9486
    9587extern void host2addr128_t_be(const addr128_t, addr128_t);

  • uspace/lib/inet/include/inet/eth_addr.h

    rd5ed54b rb4edc96  
    3838#define _LIBC_INET_ETH_ADDR_H_
    3939
    40 // XXX Move addr48 here
    41 #include <inet/addr.h>
     40#include <stdint.h>
    4241
    43 extern void mac48_encode(addr48_t *, void *);
    44 extern void mac48_decode(const void *, addr48_t *);
     42#define ETH_ADDR_SIZE 6
     43
     44typedef struct {
     45        uint8_t b[ETH_ADDR_SIZE];
     46} eth_addr_t;
     47
     48extern const eth_addr_t eth_addr_broadcast;
     49
     50extern void eth_addr_encode(eth_addr_t *, void *);
     51extern void eth_addr_decode(const void *, eth_addr_t *);
     52
     53extern int eth_addr_compare(const eth_addr_t *, const eth_addr_t *);
    4554
    4655#endif

  • uspace/lib/inet/include/inet/iplink.h

    rd5ed54b rb4edc96  
    3838#include <async.h>
    3939#include <inet/addr.h>
     40#include <inet/eth_addr.h>
    4041
    4142struct iplink_ev_ops;
    … …  
    6263typedef struct {
    6364        /** Local MAC destination address */
    64         addr48_t dest;
     65        eth_addr_t dest;
    6566        /** Serialized IP packet */
    6667        void *data;
    … …  
    7980typedef struct iplink_ev_ops {
    8081        errno_t (*recv)(iplink_t *, iplink_recv_sdu_t *, ip_ver_t);
    81         errno_t (*change_addr)(iplink_t *, addr48_t *);
     82        errno_t (*change_addr)(iplink_t *, eth_addr_t *);
    8283} iplink_ev_ops_t;
    8384
    … …  
    8990extern errno_t iplink_addr_remove(iplink_t *, inet_addr_t *);
    9091extern errno_t iplink_get_mtu(iplink_t *, size_t *);
    91 extern errno_t iplink_get_mac48(iplink_t *, addr48_t *);
    92 extern errno_t iplink_set_mac48(iplink_t *, addr48_t *);
     92extern errno_t iplink_get_mac48(iplink_t *, eth_addr_t *);
     93extern errno_t iplink_set_mac48(iplink_t *, eth_addr_t *);
    9394extern void *iplink_get_userptr(iplink_t *);
    9495

  • uspace/lib/inet/include/inet/iplink_srv.h

    rd5ed54b rb4edc96  
    11/*
    2  * Copyright (c) 2012 Jiri Svoboda
     2 * Copyright (c) 2021 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    3838#include <async.h>
    3939#include <fibril_synch.h>
     40#include <inet/addr.h>
     41#include <inet/eth_addr.h>
     42#include <inet/iplink.h>
    4043#include <stdbool.h>
    41 #include <inet/addr.h>
    42 #include <inet/iplink.h>
    4344
    4445struct iplink_ops;
    … …  
    5859        errno_t (*send6)(iplink_srv_t *, iplink_sdu6_t *);
    5960        errno_t (*get_mtu)(iplink_srv_t *, size_t *);
    60         errno_t (*get_mac48)(iplink_srv_t *, addr48_t *);
    61         errno_t (*set_mac48)(iplink_srv_t *, addr48_t *);
     61        errno_t (*get_mac48)(iplink_srv_t *, eth_addr_t *);
     62        errno_t (*set_mac48)(iplink_srv_t *, eth_addr_t *);
    6263        errno_t (*addr_add)(iplink_srv_t *, inet_addr_t *);
    6364        errno_t (*addr_remove)(iplink_srv_t *, inet_addr_t *);
    … …  
    6869extern errno_t iplink_conn(ipc_call_t *, void *);
    6970extern errno_t iplink_ev_recv(iplink_srv_t *, iplink_recv_sdu_t *, ip_ver_t);
    70 extern errno_t iplink_ev_change_addr(iplink_srv_t *, addr48_t *);
     71extern errno_t iplink_ev_change_addr(iplink_srv_t *, eth_addr_t *);
    7172
    7273#endif

  • uspace/lib/inet/include/types/inetcfg.h

    rd5ed54b rb4edc96  
    11/*
    2  * Copyright (c) 2013 Jiri Svoboda
     2 * Copyright (c) 2021 Jiri Svoboda
    33 * All rights reserved.
    44 *
    … …  
    3636#define _LIBC_TYPES_INETCFG_H_
    3737
     38#include <inet/eth_addr.h>
    3839#include <inet/inet.h>
    3940#include <stddef.h>
    … …  
    5657        size_t def_mtu;
    5758        /** Link layer address */
    58         addr48_t mac_addr;
     59        eth_addr_t mac_addr;
    5960} inet_link_info_t;
    6061
Note: See TracChangeset for help on using the changeset viewer.