Changeset 1c7ba2da in mainline


Ignore:
Timestamp:
2013-04-30T19:41:13Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4e716180, 8fdb18e
Parents:
3495654
Message:

inetsrv can use inet/addr.h from libc for address types.

Location:
uspace
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r3495654 r1c7ba2da  
    3636#define LIBC_INET_ADDR_H_
    3737
    38 #include <inet/inet.h>
     38#include <stdint.h>
     39
     40/** Node address */
     41typedef struct {
     42        uint32_t ipv4;
     43} inet_addr_t;
     44
     45/** Network address */
     46typedef struct {
     47        /** Address */
     48        uint32_t ipv4;
     49        /** Number of valid bits in @c ipv4 */
     50        int bits;
     51} inet_naddr_t;
    3952
    4053extern int inet_naddr_parse(const char *, inet_naddr_t *);

  • TabularUnified uspace/lib/c/include/inet/inet.h

    r3495654 r1c7ba2da  
    3636#define LIBC_INET_INET_H_
    3737
     38#include <inet/addr.h>
    3839#include <sys/types.h>
    3940
    4041#define INET_TTL_MAX 255
    41 
    42 /** Node address */
    43 typedef struct {
    44         uint32_t ipv4;
    45 } inet_addr_t;
    46 
    47 /** Network address */
    48 typedef struct {
    49         /** Address */
    50         uint32_t ipv4;
    51         /** Number of valid bits in @c ipv4 */
    52         int bits;
    53 } inet_naddr_t;
    5442
    5543typedef struct {

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

    r3495654 r1c7ba2da  
    4040#include <adt/list.h>
    4141#include <stdbool.h>
     42#include <inet/addr.h>
    4243#include <inet/iplink.h>
    4344#include <ipc/loc.h>
    … …  
    6162        link_t client_list;
    6263} inetping_client_t;
    63 
    64 /** Host address */
    65 typedef struct {
    66         uint32_t ipv4;
    67 } inet_addr_t;
    68 
    69 /** Network address */
    70 typedef struct {
    71         /** Address */
    72         uint32_t ipv4;
    73         /** Number of valid bits in @c ipv4 */
    74         int bits;
    75 } inet_naddr_t;
    7664
    7765/** Address object info */
Note: See TracChangeset for help on using the changeset viewer.