Changeset b9f7848b in mainline for uspace/lib/c


Ignore:
Timestamp:
2013-09-16T06:07:42Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
884c56b, f65d9cc, f9a2831
Parents:
5ed8b72 (diff), 947e2ef (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge DHCP improvements.

Location:
uspace/lib/c
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/generic/inetcfg.c

    r5ed8b72 rb9f7848b  
    279279        aid_t req = async_send_1(exch, INETCFG_LINK_GET, link_id, &answer);
    280280        aid_t dreq = async_data_read(exch, name_buf, LOC_NAME_MAXLEN, &dreply);
     281        int rc = async_data_read_start(exch, &linfo->mac_addr, sizeof(addr48_t));
    281282        async_wait_for(dreq, &dretval);
    282283
    283284        async_exchange_end(exch);
    284285
    285         if (dretval != EOK) {
     286        if (dretval != EOK || rc != EOK) {
    286287                async_forget(req);
    287288                return dretval;

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

    r5ed8b72 rb9f7848b  
    3939#include <ipc/loc.h>
    4040#include <sys/types.h>
    41 
    42 #define INET_TTL_MAX 255
    43 
    44 typedef struct {
    45         /** Local IP link service ID (optional) */
    46         service_id_t iplink;
    47         inet_addr_t src;
    48         inet_addr_t dest;
    49         uint8_t tos;
    50         void *data;
    51         size_t size;
    52 } inet_dgram_t;
    53 
    54 typedef struct {
    55         int (*recv)(inet_dgram_t *);
    56 } inet_ev_ops_t;
    57 
    58 typedef enum {
    59         INET_DF = 1
    60 } inet_df_t;
     41#include <types/inet.h>
    6142
    6243extern int inet_init(uint8_t, inet_ev_ops_t *);

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

    r5ed8b72 rb9f7848b  
    3838#include <inet/inet.h>
    3939#include <sys/types.h>
    40 
    41 /** Address object info */
    42 typedef struct {
    43         /** Network address */
    44         inet_naddr_t naddr;
    45         /** Link service ID */
    46         sysarg_t ilink;
    47         /** Address object name */
    48         char *name;
    49 } inet_addr_info_t;
    50 
    51 /** IP link info */
    52 typedef struct {
    53         /** Link service name */
    54         char *name;
    55         /** Default MTU */
    56         size_t def_mtu;
    57 } inet_link_info_t;
    58 
    59 /** Static route info */
    60 typedef struct {
    61         /** Destination network address */
    62         inet_naddr_t dest;
    63         /** Router address */
    64         inet_addr_t router;
    65         /** Static route name */
    66         char *name;
    67 } inet_sroute_info_t;
     40#include <types/inetcfg.h>
    6841
    6942extern int inetcfg_init(void);
Note: See TracChangeset for help on using the changeset viewer.