Subversion Repositories HelenOS

Compare Revisions

No changes between revisions

Ignore whitespace Rev 4504 → Rev 4505

/branches/network/uspace/srv/net/include/sockaddr.h
39,8 → 39,8
 
#include <sys/types.h>
 
#define INET_ADDRSTRLEN ( 4 * 3 + 3 )
#define INET6_ADDRSTRLEN ( 8 * 4 + 7 )
#define INET_ADDRSTRLEN ( 4 * 3 + 3 + 1 )
#define INET6_ADDRSTRLEN ( 8 * 4 + 7 + 1 )
 
typedef struct sockaddr sockaddr_t;
typedef struct in_addr in_addr_t;
/branches/network/uspace/srv/net/include/ip_client.h
0,0 → 1,137
/*
* Copyright (c) 2009 Lukas Mejdrech
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* - The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
 
/** @addtogroup ip
* @{
*/
 
/**
* @file
*/
 
#ifndef __NET_IP_CLIENT_H__
#define __NET_IP_CLIENT_H__
 
#include "../structures/packet/packet.h"
 
#define IPVERSION 4
#define MAXTTL 255
#define IPDEFTTL 64
 
#define IPTOS_TOS_MASK 0x1E
#define IPTOS_PRECEDENCE_SHIFT 5
#define IPTOS_DELAY_SHIFT 4
#define IPTOS_THROUGHPUT_SHIFT 3
#define IPTOS_RELIABILITY_SHIFT 2
#define IPTOS_COST_SHIFT 1
 
#define IPTOS_NORMALDELAY ( 0x0 << IPTOS_DELAY_SHIFT )
#define IPTOS_LOWDELAY ( 0x1 << IPTOS_DELAY_SHIFT )
 
#define IPTOS_NORMALTHROUGHPUT ( 0x0 << IPTOS_THROUGHPUT_SHIFT )
#define IPTOS_THROUGHPUT ( 0x1 << IPTOS_THROUGHPUT_SHIFT )
 
#define IPTOS_NORMALRELIABILITY ( 0x0 << IPTOS_RELIABILITY_SHIFT )
#define IPTOS_RELIABILITY ( 0x1 << IPTOS_RELIABILITY_SHIFT )
 
#define IPTOS_NORMALCOST ( 0x0 << IPTOS_COST_SHIFT )
#define IPTOS_MICNCOST ( 0x1 << IPTOS_COST_SHIFT )
 
#define IPTOS_PREC_MASK 0xE0
#define IPTOS_PREC_ROUTINE ( 0x0 << IPTOS_PRECEDENCE_SHIFT )
#define IPTOS_PREC_PRIORITY ( 0x1 << IPTOS_PRECEDENCE_SHIFT )
#define IPTOS_PREC_IMMEDIATE ( 0x2 << IPTOS_PRECEDENCE_SHIFT )
#define IPTOS_PREC_FLASH ( 0x3 << IPTOS_PRECEDENCE_SHIFT )
#define IPTOS_PREC_FLASHOVERRIDE ( 0x4 << IPTOS_PRECEDENCE_SHIFT )
#define IPTOS_PREC_CRITIC_ECP ( 0x5 << IPTOS_PRECEDENCE_SHIFT )
#define IPTOS_PREC_INTERNETCONTROL ( 0x6 << IPTOS_PRECEDENCE_SHIFT )
#define IPTOS_PREC_NETCONTROL ( 0x7 << IPTOS_PRECEDENCE_SHIFT )
 
#define IPOPT_COPY_SHIFT 7
#define IPOPT_CLASS_SHIFT 5
#define IPOPT_NUMBER_SHIFT 0
#define IPOPT_CLASS_MASK 0x60
#define IPOPT_NUMBER_MASK 0x1F
 
#define IPOPT_COPY ( 1 << IPOPT_COPY_SHIFT )
 
#define IPOPT_TYPE( copy, class, number ) ((( copy ) & IPOPT_COPY ) | (( class ) & IPOPT_CLASS_MASK ) | (( number << IPOPT_NUMBER_SHIFT ) & IPOPT_NUMBER_MASK ))
 
#define IPOPT_COPIED( o ) (( o ) & IPOPT_COPY )
#define IPOPT_CLASS( o ) (( o ) & IPOPT_CLASS_MASK )
#define IPOPT_NUMBER( o ) (( o ) & IPOPT_NUMBER_MASK )
 
#define IPOPT_CONTROL ( 0 << IPOPT_CLASS_SHIFT )
#define IPOPT_RESERVED1 ( 1 << IPOPT_CLASS_SHIFT )
#define IPOPT_MEASUREMENT ( 2 << IPOPT_CLASS_SHIFT )
#define IPOPT_RESERVED2 ( 3 << IPOPT_CLASS_SHIFT )
 
//#define IPOPT_END_OF_LIST 0x0
#define IPOPT_END IPOPT_TYPE( 0, IPOPT_CONTROL, 0 )
//#define IPOPT_NO_OPERATION 0x1
#define IPOPT_NOOP IPOPT_TYPE( 0, IPOPT_CONTROL, 1 )
//#define IPOPT_SECURITY 0x82
#define IPOPT_SEC IPOPT_TYPE( IPOPT_COPY, IPOPT_CONTROL, 2 )
#define IPOPT_SEC_LENGTH 11
#define IPOPT_SEC_UNCLASIFIED 0x0
#define IPOPT_SEC_CONFIDENTIAL 0xF035
#define IPOPT_SEC_EFTO 0x789A
#define IPOPT_SEC_MMMM 0xBC4D
#define IPOPT_SEC_PROG 0x5E26
#define IPOPT_SEC_RESTRICTED 0xAF13
#define IPOPT_SEC_SECRET 0xD788
#define IPOPT_SEC_TOP_SECRET 0x6BC5
//#define IPOPT_LOOSE_SOURCE 0x83
#define IPOPT_LSRR IPOPT_TYPE( IPOPT_COPY, IPOPT_CONTROL, 3 )
//#define IPOPT_STRICT_SOURCE 0x89
#define IPOPT_SSRR IPOPT_TYPE( IPOPT_COPY, IPOPT_CONTROL, 9 )
//#define IPOPT_RECORD_ROUTE 0x07
#define IPOPT_RR IPOPT_TYPE( IPOPT_COPY, IPOPT_CONTROL, 7 )
//#define IPOPT_STREAM_IDENTIFIER 0x88
#define IPOPT_SID IPOPT_TYPE( IPOPT_COPY, IPOPT_CONTROL, 8 )
#define IPOPT_SID_LENGTH 4
//#define IPOPT_INTERNET_TIMESTAMP 0x44
#define IPOPT_TIMESTAMP IPOPT_TYPE( IPOPT_COPY, IPOPT_MEASUREMENT, 4 )
#define IPOPT_CIPSO IPOPT_TYPE( IPOPT_COPY, IPOPT_CONTROL, 5 )
 
#define IPOPT_NOP IPOPT_NOOP
#define IPOPT_EOL IPOPT_END
#define IPOPT_TS IPOPT_TIMESTAMP
 
#define IPOPT_TS_TSONLY 0 /* timestamps only */
#define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */
#define IPOPT_TS_PRESPEC 3 /* specified modules only */
 
int ip_client_prepare_packet( packet_t packet, int protocol, int ttl, int tos, int dont_fragment, int ipopt_length );
 
// TODO ipopt manipulation
 
#endif
 
/** @}
*/
Property changes:
Added: svn:eol-style
+native
\ No newline at end of property
/branches/network/uspace/srv/net/include/net_interface.h
58,7 → 58,7
* @returns EINVAL if the count is zero (0).
* @returns Other error codes as defined for the generic_translate_req() function.
*/
int net_get_device_conf_req( int net_phone, device_id_t device_id, measured_string_ref * configuration, int count, char ** data );
int net_get_device_conf_req( int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data );
 
/** Returns the global configuration.
* @param net_phone The networking module phone. Input parameter.
70,7 → 70,7
* @returns EINVAL if the count is zero (0).
* @returns Other error codes as defined for the generic_translate_req() function.
*/
int net_get_conf_req( int net_phone, measured_string_ref * configuration, int count, char ** data );
int net_get_conf_req( int net_phone, measured_string_ref * configuration, size_t count, char ** data );
 
/** Frees the received settings.
* @param settings The received settings. Input parameter.
/branches/network/uspace/srv/net/include/crc.h
31,7 → 31,7
*/
 
/** @file
* General CRC computation.
* General CRC and checksum computation.
*/
 
#ifndef __NET_CRC_H__
69,6 → 69,21
*/
uint32_t compute_crc32_be( uint32_t seed, uint8_t * data, int length );
 
/** Computes sum of the 2 byte fields.
* Padds one zero (0) byte if odd.
* @param seed Initial value. Often used as 0 or ~0. Input parameter.
* @param data Pointer to the beginning of data to process. Input parameter.
* @param length Length of the data in bytes. Input parameter.
* @returns The computed checksum of the length bytes of the data.
*/
uint32_t compute_checksum( uint32_t seed, uint8_t * data, int length );
 
/** Compacts the computed checksum to the 16 bit number adding the carries.
* @param Computed checksum. Input parameter.
* @returns Compacted computed checksum to the 16 bits.
*/
uint16_t compact_checksum( uint32_t sum );
 
#endif
 
/** @}
/branches/network/uspace/srv/net/include/ip_interface.h
48,9 → 48,20
 
#include "../structures/packet/packet.h"
 
#include "sockaddr.h"
 
/** The transport layer notification function type definition.
* Notifies the transport layer modules about the received packet/s.
* @param device_id The device identifier. Input parameter.
* @param packet The received packet or the received packet queue. Input parameter.
* @param receiver The receiving module service. Input parameter.
* @returns EOK on success.
*/
typedef int ( * tl_received_msg_t )( device_id_t device_id, packet_t packet, services_t receiver );
 
/** \todo
*/
int ip_bind_service( services_t service, services_t me, async_client_conn_t receiver );
int ip_bind_service( services_t service, int protocol, services_t me, async_client_conn_t receiver, tl_received_msg_t tl_received_msg );
 
/** Registers the new device.
* Registers itself as the ip packet receiver.
85,6 → 96,18
*/
int ip_connect_module( services_t service );
 
/** \todo
*/
int ip_add_route_req( int ip_phone, device_id_t device_id, in_addr_t address, in_addr_t netmask, in_addr_t gateway );
 
/** \todo
*/
int ip_set_gateway_req( int ip_phone, device_id_t device_id, in_addr_t gateway );
 
/** \todo
*/
int ip_packet_size_req( int ip_phone, device_id_t device_id, size_t * addr_len, size_t * prefix, size_t * content, size_t * suffix );
 
#endif
 
/** @}