Changeset 10056483 in mainline for uspace/srv/net/tl/icmp/icmp.c


Ignore:
Timestamp:
2010-10-13T22:48:25Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ef689ef0
Parents:
b278b4e (diff), 753bca3 (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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/tl/icmp/icmp.c

    rb278b4e r10056483  
    4444#include <ipc/ipc.h>
    4545#include <ipc/services.h>
     46#include <ipc/icmp.h>
    4647#include <sys/time.h>
    4748#include <sys/types.h>
     
    5960#include <packet_remote.h>
    6061#include <net_checksum.h>
    61 #include <icmp_api.h>
     62#include <net/icmp_api.h>
    6263#include <icmp_client.h>
    63 #include <icmp_codes.h>
    64 #include <icmp_common.h>
     64#include <net/icmp_codes.h>
     65#include <net/icmp_common.h>
    6566#include <icmp_interface.h>
    6667#include <il_interface.h>
     
    7172#include <tl_interface.h>
    7273#include <tl_local.h>
    73 #include <icmp_messages.h>
    7474#include <icmp_header.h>
    7575
     
    449449}
    450450
    451 int icmp_connect_module(services_t service, suseconds_t timeout){
    452         icmp_echo_ref echo_data;
    453         icmp_param_t id;
    454         int index;
    455 
    456         echo_data = (icmp_echo_ref) malloc(sizeof(*echo_data));
    457         if(! echo_data){
    458                 return ENOMEM;
    459         }
    460         // assign a new identifier
    461         fibril_rwlock_write_lock(&icmp_globals.lock);
    462         index = icmp_bind_free_id(echo_data);
    463         if(index < 0){
    464                 free(echo_data);
    465                 fibril_rwlock_write_unlock(&icmp_globals.lock);
    466                 return index;
    467         }else{
    468                 id = echo_data->identifier;
    469                 fibril_rwlock_write_unlock(&icmp_globals.lock);
    470                 // return the echo data identifier as the ICMP phone
    471                 return id;
    472         }
    473 }
    474 
    475451int icmp_initialize(async_client_conn_t client_connection){
    476452        ERROR_DECLARE;
     
    485461        icmp_replies_initialize(&icmp_globals.replies);
    486462        icmp_echo_data_initialize(&icmp_globals.echo_data);
    487         icmp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_ICMP, SERVICE_ICMP, client_connection, icmp_received_msg);
     463        icmp_globals.ip_phone = ip_bind_service(SERVICE_IP, IPPROTO_ICMP, SERVICE_ICMP, client_connection);
    488464        if(icmp_globals.ip_phone < 0){
    489465                return icmp_globals.ip_phone;
Note: See TracChangeset for help on using the changeset viewer.