Changeset a7a85d16 in mainline for uspace/srv


Ignore:
Timestamp:
2010-10-16T17:16:30Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
668f8cbf, e0e568ff, f14291b
Parents:
ef689ef0 (diff), c62ae1d6 (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 from lp:~jakub/helenos/net.

Location:
uspace/srv/net
Files:
15 edited
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/srv/net/il/arp/arp.c

    ref689ef0 ra7a85d16  
    4646#include <ipc/services.h>
    4747#include <ipc/net.h>
     48#include <ipc/arp.h>
     49#include <ipc/il.h>
    4850#include <byteorder.h>
    4951#include <err.h>
    … …  
    5860#include <packet_client.h>
    5961#include <packet_remote.h>
    60 #include <il_messages.h>
    6162#include <il_interface.h>
    6263#include <il_local.h>
    63 #include <arp_messages.h>
    6464
    6565#include "arp.h"
    … …  
    534534        }
    535535        return EOK;
    536 }
    537 
    538 task_id_t arp_task_get_id(void){
    539         return task_get_id();
    540536}
    541537

  • uspace/srv/net/il/arp/arp_module.c

    ref689ef0 ra7a85d16  
    8080       
    8181        async_set_client_connection(client_connection);
    82         arp_globals.net_phone = net_connect_module(SERVICE_NETWORKING);
     82        arp_globals.net_phone = net_connect_module();
    8383        ERROR_PROPAGATE(pm_init());
    8484       

  • uspace/srv/net/il/ip/ip.c

    ref689ef0 ra7a85d16  
    4545#include <ipc/services.h>
    4646#include <ipc/net.h>
     47#include <ipc/nil.h>
     48#include <ipc/il.h>
     49#include <ipc/ip.h>
    4750#include <sys/types.h>
    4851#include <byteorder.h>
    … …  
    7174#include <packet_client.h>
    7275#include <packet_remote.h>
    73 #include <nil_messages.h>
    74 #include <il_messages.h>
    7576#include <il_local.h>
    76 #include <ip_local.h>
    7777
    7878#include "ip.h"
    7979#include "ip_header.h"
    80 #include "ip_messages.h"
    8180#include "ip_module.h"
     81#include "ip_local.h"
    8282
    8383/** IP module name.
    … …  
    423423        ip_globals.client_connection = client_connection;
    424424        ERROR_PROPAGATE(modules_initialize(&ip_globals.modules));
    425         ERROR_PROPAGATE(add_module(NULL, &ip_globals.modules, ARP_NAME, ARP_FILENAME, SERVICE_ARP, arp_task_get_id(), arp_connect_module));
     425        ERROR_PROPAGATE(add_module(NULL, &ip_globals.modules, ARP_NAME, ARP_FILENAME, SERVICE_ARP, 0, arp_connect_module));
    426426        fibril_rwlock_write_unlock(&ip_globals.lock);
    427427        return EOK;

  • uspace/srv/net/il/ip/ip_local.h

    ref689ef0 ra7a85d16  
    3131 */
    3232
    33 #ifndef __NET_IP_LOCAL_H__
    34 #define __NET_IP_LOCAL_H__
     33#ifndef NET_IP_LOCAL_H_
     34#define NET_IP_LOCAL_H_
    3535
    3636#include <async.h>

  • uspace/srv/net/il/ip/ip_module.c

    ref689ef0 ra7a85d16  
    7979       
    8080        async_set_client_connection(client_connection);
    81         ip_globals.net_phone = net_connect_module(SERVICE_NETWORKING);
     81        ip_globals.net_phone = net_connect_module();
    8282        ERROR_PROPAGATE(pm_init());
    8383       

  • uspace/srv/net/net/net.c

    ref689ef0 ra7a85d16  
    4646
    4747#include <ipc/ipc.h>
     48#include <ipc/services.h>
    4849#include <ipc/net.h>
    49 #include <ipc/services.h>
     50#include <ipc/net_net.h>
     51#include <ipc/il.h>
    5052
    5153#include <net/modules.h>
    … …  
    5557#include <adt/module_map.h>
    5658#include <net/packet.h>
    57 #include <il_messages.h>
    5859#include <netif_remote.h>
    5960#include <net/device.h>
    … …  
    6162#include <net_interface.h>
    6263#include <ip_interface.h>
    63 #include <net_net_messages.h>
    6464
    6565#include "net.h"

  • uspace/srv/net/netif/lo/lo.c

    ref689ef0 ra7a85d16  
    4343#include <ipc/ipc.h>
    4444#include <ipc/services.h>
     45#include <ipc/nil.h>
    4546
    4647#include <net/modules.h>
    … …  
    4950#include <net/device.h>
    5051#include <nil_interface.h>
    51 #include <nil_messages.h>
    5252#include <netif_interface.h>
    5353#include <netif_local.h>

  • uspace/srv/net/netstart/netstart.c

    ref689ef0 ra7a85d16  
    4848#include <ipc/ipc.h>
    4949#include <ipc/services.h>
     50#include <ipc/net_net.h>
    5051
    5152#include <net/modules.h>
    52 #include <net_net_messages.h>
    5353
    5454#include "self_test.h"

  • uspace/srv/net/nil/eth/eth_module.c

    ref689ef0 ra7a85d16  
    6363       
    6464        async_set_client_connection(client_connection);
    65         int net_phone = net_connect_module(SERVICE_NETWORKING);
     65        int net_phone = net_connect_module();
    6666        ERROR_PROPAGATE(pm_init());
    6767       

  • uspace/srv/net/nil/nildummy/nildummy_module.c

    ref689ef0 ra7a85d16  
    7171       
    7272        async_set_client_connection(client_connection);
    73         int net_phone = net_connect_module(SERVICE_NETWORKING);
     73        int net_phone = net_connect_module();
    7474        ERROR_PROPAGATE(pm_init());
    7575       

  • uspace/srv/net/tl/icmp/icmp.c

    ref689ef0 ra7a85d16  
    4545#include <ipc/services.h>
    4646#include <ipc/net.h>
     47#include <ipc/tl.h>
    4748#include <ipc/icmp.h>
    4849#include <sys/time.h>
    … …  
    6970#include <ip_interface.h>
    7071#include <net_interface.h>
    71 #include <tl_messages.h>
    7272#include <tl_interface.h>
    7373#include <tl_local.h>

  • uspace/srv/net/tl/icmp/icmp_module.c

    ref689ef0 ra7a85d16  
    6969
    7070        async_set_client_connection(client_connection);
    71         icmp_globals.net_phone = net_connect_module(SERVICE_NETWORKING);
     71        icmp_globals.net_phone = net_connect_module();
    7272        if(icmp_globals.net_phone < 0){
    7373                return icmp_globals.net_phone;

  • uspace/srv/net/tl/tcp/tcp.c

    ref689ef0 ra7a85d16  
    4848#include <ipc/services.h>
    4949#include <ipc/net.h>
     50#include <ipc/tl.h>
    5051#include <ipc/socket.h>
    5152
    … …  
    6869#include <socket_core.h>
    6970#include <tl_common.h>
    70 #include <tl_messages.h>
    7171#include <tl_local.h>
    7272#include <tl_interface.h>

  • uspace/srv/net/tl/tcp/tcp_module.c

    ref689ef0 ra7a85d16  
    7171       
    7272        async_set_client_connection(client_connection);
    73         tcp_globals.net_phone = net_connect_module(SERVICE_NETWORKING);
     73        tcp_globals.net_phone = net_connect_module();
    7474        ERROR_PROPAGATE(pm_init());
    7575       

  • uspace/srv/net/tl/udp/udp.c

    ref689ef0 ra7a85d16  
    4343#include <ipc/services.h>
    4444#include <ipc/net.h>
     45#include <ipc/tl.h>
    4546#include <ipc/socket.h>
    4647#include <errno.h>
    … …  
    6768#include <tl_local.h>
    6869#include <tl_interface.h>
    69 #include <tl_messages.h>
    7070
    7171#include "udp.h"

  • uspace/srv/net/tl/udp/udp_module.c

    ref689ef0 ra7a85d16  
    6969
    7070        async_set_client_connection(client_connection);
    71         udp_globals.net_phone = net_connect_module(SERVICE_NETWORKING);
     71        udp_globals.net_phone = net_connect_module();
    7272        if(udp_globals.net_phone < 0){
    7373                return udp_globals.net_phone;
Note: See TracChangeset for help on using the changeset viewer.