--- a/package_definition.xml Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="wlan" name="WLAN" levels="hw low mid high tools test">
- <collection id="wlan_bearer" name="WLAN Bearer" level="hw">
- <component id="wlanpsmplugin" filter="s60" name="WLAN PSM Plugin" class="plugin">
- <unit bldFile="wlan_bearer/wlanpsmplugin/group"/>
- </component>
- <component id="wlanagent" filter="s60" name="WLAN Agent">
- <unit bldFile="wlan_bearer/wlanagent/group"/>
- </component>
- <component id="wlandbif_cd" filter="s60" name="WLAN CommsDat interface">
- <unit bldFile="wlan_bearer/wlandbif_cd/group"/>
- </component>
- <component id="wlanengine" filter="s60" name="WLAN Engine">
- <unit bldFile="wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/group"/>
- </component>
- <component id="wlanldd" filter="s60" name="WLAN LDD">
- <unit bldFile="wlan_bearer/wlanldd/wlan_symbian/wlanldd_symbian/group"/>
- </component>
- <component id="wlannwif" filter="s60" name="WLAN Network Interface">
- <unit bldFile="wlan_bearer/wlannwif/group"/>
- </component>
- </collection>
- <collection id="wlanapitest" name="WLAN API Tests" level="test">
- <component id="wlanhaitest" name="WLAN HAI Tests" introduced="^2" purpose="development" filter="test">
- <unit mrp="wlanapitest/wlanhaitest/group/wlanhaitest.mrp" bldFile="wlanapitest/wlanhaitest/group"/>
- </component>
- </collection>
- <collection id="wlan_info" name="WLAN Info" level="test">
- <component id="wlan_pub" filter="s60" name="WLAN Public Interfaces" class="api">
- <unit bldFile="wlan_pub/group"/>
- </component>
- <component id="wlan_plat" filter="s60" name="WLAN Platform Interfaces" class="api">
- <unit bldFile="wlan_plat/group"/>
- </component>
- <component id="wlan_metadata" name="WLAN Metadata" class="config" introduced="^2" purpose="development" target="desktop">
- <unit mrp="wlan_info/wlan_metadata/wlan_metadata.mrp"/>
- </component>
- </collection>
- </package>
-</SystemDefinition>
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/abs_wlan_eapol_callback_interface.h Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/abs_wlan_eapol_callback_interface.h Fri Jun 11 15:34:34 2010 +0300
@@ -114,6 +114,12 @@
core_type_list_c< protected_setup_credential_c > & credential_list ) = 0;
/**
+ * The complete_disassociation() function completes disassociation function.
+ */
+ virtual core_error_e complete_disassociation(
+ network_id_c * receive_network_id ) = 0;
+
+ /**
* The handle_error() function tells about error from EAPOL side.
*/
virtual void handle_error(
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/core_connection_data.h Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/core_connection_data.h Fri Jun 11 15:34:34 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 33 %
+* %version: 34 %
*/
#ifndef CORE_CONNECTION_DATA_H
@@ -468,6 +468,23 @@
const core_mac_address_s& bssid );
/**
+ * Get the status of the ongoing authentication.
+ *
+ * @since S60 v3.1
+ * @return The status of the ongoing authentication.
+ */
+ core_error_e eapol_auth_failure() const;
+
+ /**
+ * Set the status of the ongoing authentication.
+ *
+ * @since S60 v3.1
+ * @param error The status of the ongoing authentication.
+ */
+ void set_eapol_auth_failure(
+ core_error_e error );
+
+ /**
* Return the list of active traffic streams.
*
* @since S60 v3.2
@@ -501,6 +518,23 @@
bool_t is_eapol_connecting );
/**
+ * Check whether EAPOL is disconnecting.
+ *
+ * @since S60 v3.1
+ * @return Whether EAPOL is disconnecting.
+ */
+ bool_t is_eapol_disconnecting() const;
+
+ /**
+ * Set the status of EAPOL disconnecting.
+ *
+ * @since S60 v3.1
+ * @param is_eapol_disconnecting Whether EAPOL is disconnecting.
+ */
+ void set_eapol_disconnecting(
+ bool_t is_eapol_disconnecting );
+
+ /**
* Check whether disconnection is ongoing.
*
* @since S60 v3.2
@@ -751,15 +785,21 @@
/** The BSSID currently being authenticated against. */
core_mac_address_s eapol_auth_bssid_m;
+ /** Status of the currently ongoing authentication. */
+ core_error_e eapol_auth_failure_m;
+
/** List of active traffic streams. */
core_traffic_stream_list_c traffic_stream_list_m;
/** List of virtual traffic streams. */
core_virtual_traffic_stream_list_c virtual_traffic_stream_list_m;
-
+
/** Whether EAPOL is connecting. */
bool_t is_eapol_connecting_m;
-
+
+ /** Whether EAPOL is disconnecting. */
+ bool_t is_eapol_disconnecting_m;
+
/** Whether disconnection is ongoing. */
bool_t is_disconnecting_m;
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/core_eapol_handler.h Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/core_eapol_handler.h Fri Jun 11 15:34:34 2010 +0300
@@ -192,6 +192,12 @@
core_type_list_c< protected_setup_credential_c > & credential_list );
/**
+ * From abs_wlan_eapol_callback_interface_c
+ */
+ virtual core_error_e complete_disassociation(
+ network_id_c * receive_network_id );
+
+ /**
* From abs_wlan_eapol_callback_interface_c
*/
virtual void handle_error(
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/core_operation_handle_bss_lost.h Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/core_operation_handle_bss_lost.h Fri Jun 11 15:34:34 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 11 %
+* %version: 12 %
*/
#ifndef CORE_OPERATION_HANDLE_BSS_LOST_H
@@ -41,6 +41,7 @@
enum core_state_e
{
core_state_init = core_base_state_next,
+ core_state_eapol_disassociated,
core_state_set_tx_level,
core_state_set_tx_level_success,
core_state_scan_start,
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/core_operation_release.h Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/core_operation_release.h Fri Jun 11 15:34:34 2010 +0300
@@ -37,6 +37,7 @@
enum core_state_e
{
core_state_init = core_base_state_next,
+ core_state_eapol_disassociated,
core_state_disable_user_data,
core_state_tx_power_level,
core_state_disconnect,
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/core_sub_operation_wpa_connect.h Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/core_sub_operation_wpa_connect.h Fri Jun 11 15:34:34 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 28 %
+* %version: 29 %
*/
#ifndef CORE_SUB_OPERATION_WPA_CONNECT_H
@@ -65,6 +65,7 @@
core_state_req_state_notification,
core_state_bss_lost,
core_state_user_cancel,
+ core_state_user_cancel_disassociated,
core_state_MAX
};
@@ -190,6 +191,12 @@
/**
* From abs_wlan_eapol_callback_interface_c
*/
+ core_error_e complete_disassociation(
+ network_id_c * receive_network_id );
+
+ /**
+ * From abs_wlan_eapol_callback_interface_c
+ */
void handle_error(
wlan_eapol_if_error_e errorcode,
wlan_eapol_if_message_type_function_e function );
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/core_wlan_eapol_if_message.h Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/inc/core_wlan_eapol_if_message.h Fri Jun 11 15:34:34 2010 +0300
@@ -90,6 +90,7 @@
wlan_eapol_if_message_type_function_update_wlan_database_reference_values = 21,
wlan_eapol_if_message_type_function_complete_start_wpx_fast_roam_reassociation = 22,
wlan_eapol_if_message_type_function_new_protected_setup_credentials = 23,
+ wlan_eapol_if_message_type_function_complete_disassociation = 37
};
@@ -752,6 +753,8 @@
core_error_e parse_new_protected_setup_credentials(
core_type_list_c< protected_setup_credential_c > & credential_list );
+ core_error_e parse_complete_disassociation(
+ network_id_c * receive_network_id );
void debug_print();
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_connection_data.cpp Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_connection_data.cpp Fri Jun 11 15:34:34 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 37 %
+* %version: 38 %
*/
#include "core_connection_data.h"
@@ -52,9 +52,11 @@
is_eapol_authentication_started_m( false_t ),
is_eapol_authenticating_m( false_t ),
eapol_auth_bssid_m( ZERO_MAC_ADDR ),
+ eapol_auth_failure_m( core_error_ok ),
traffic_stream_list_m( ),
virtual_traffic_stream_list_m( ),
is_eapol_connecting_m( false_t ),
+ is_eapol_disconnecting_m( false_t ),
is_disconnecting_m( false_t ),
last_roam_reason_m( core_roam_reason_none ),
last_roam_failed_reason_m( core_roam_failed_reason_none ),
@@ -672,6 +674,23 @@
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
//
+core_error_e core_connection_data_c::eapol_auth_failure() const
+ {
+ return eapol_auth_failure_m;
+ }
+
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//
+void core_connection_data_c::set_eapol_auth_failure(
+ core_error_e error )
+ {
+ eapol_auth_failure_m = error;
+ }
+
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//
core_traffic_stream_list_c& core_connection_data_c::traffic_stream_list()
{
return traffic_stream_list_m;
@@ -705,6 +724,23 @@
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
//
+bool_t core_connection_data_c::is_eapol_disconnecting() const
+ {
+ return is_eapol_disconnecting_m;
+ }
+
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//
+void core_connection_data_c::set_eapol_disconnecting(
+ bool_t is_eapol_disconnecting )
+ {
+ is_eapol_disconnecting_m = is_eapol_disconnecting;
+ }
+
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//
bool_t core_connection_data_c::is_disconnecting() const
{
return is_disconnecting_m;
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_eapol_handler.cpp Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_eapol_handler.cpp Fri Jun 11 15:34:34 2010 +0300
@@ -110,6 +110,17 @@
send_unencrypted );
}
+ if ( !server_m->get_connection_data()->current_ap_data() )
+ {
+ /**
+ * EAPOL might try to send packets after a failed connection attempt,
+ * filter them out. This check is only valid when no handler is registered.
+ */
+ DEBUG( "core_eapol_handler_c::packet_send() - not connected or attempting connection, ignoring" );
+
+ return core_error_ok;
+ }
+
server_m->send_data_frame(
*server_m->get_connection_data()->current_ap_data(),
core_frame_type_ethernet,
@@ -582,6 +593,20 @@
}
break;
}
+ case wlan_eapol_if_message_type_function_complete_disassociation:
+ {
+ network_id_c network_id( NULL, 0, NULL, 0, 0 );
+
+ error = function.parse_complete_disassociation(
+ &network_id );
+ if ( error == core_error_ok )
+ {
+ error = complete_disassociation(
+ &network_id );
+ }
+ break;
+
+ }
case wlan_eapol_if_message_type_function_none:
default:
DEBUG1( "core_eapol_handler_c::send_data() - Error: unknown function %i", func );
@@ -853,6 +878,69 @@
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
//
+core_error_e core_eapol_handler_c::complete_disassociation(
+ network_id_c * receive_network_id )
+ {
+ DEBUG( "core_eapol_handler_c::complete_disassociation()" );
+
+ if( !server_m->get_connection_data() ||
+ !server_m->get_connection_data()->is_eapol_disconnecting() )
+ {
+ DEBUG( "core_eapol_handler_c::handle_wlan_authentication_state() - complete_disassociation received while not disconnecting, ignoring" );
+
+ return core_error_general;
+ }
+
+ const core_mac_address_s cur_bssid(
+ server_m->get_connection_data()->eapol_auth_bssid() );
+ const core_mac_address_s bssid(
+ receive_network_id->source() );
+ DEBUG6( "core_eapol_handler_c::complete_disassociation() - function BSSID is %02X:%02X:%02X:%02X:%02X:%02X",
+ bssid.addr[0], bssid.addr[1], bssid.addr[2],
+ bssid.addr[3], bssid.addr[4], bssid.addr[5] );
+ DEBUG6( "core_eapol_handler_c::complete_disassociation() - current BSSID is %02X:%02X:%02X:%02X:%02X:%02X",
+ cur_bssid.addr[0], cur_bssid.addr[1], cur_bssid.addr[2],
+ cur_bssid.addr[3], cur_bssid.addr[4], cur_bssid.addr[5] );
+ DEBUG1( "core_eapol_handler_c::complete_disassociation() - EAPOL authentication failure status is %u",
+ server_m->get_connection_data()->eapol_auth_failure() );
+
+ bool_t is_eapol_authentication_started(
+ server_m->get_connection_data()->is_eapol_authentication_started() );
+ DEBUG( "core_eapol_handler_c::complete_disassociation() - marking is_eapol_authenticating as false" );
+ server_m->get_connection_data()->set_eapol_authenticating(
+ false_t );
+ DEBUG( "core_eapol_handler_c::complete_disassociation() - marking is_eapol_authentication_started as false" );
+ server_m->get_connection_data()->set_eapol_authentication_started(
+ false_t );
+ DEBUG( "core_eapol_handler_c::complete_disassociation() - marking is_eapol_disconnecting as false" );
+ server_m->get_connection_data()->set_eapol_disconnecting(
+ false_t );
+
+ /**
+ * We only care about the pending status notification in case the authentication
+ * has been started by us, otherwise we'll just ignore it.
+ */
+ if ( is_eapol_authentication_started )
+ {
+ DEBUG( "core_eapol_handler_c::complete_disassociation() - completing request" );
+ server_m->request_complete(
+ REQUEST_ID_CORE_INTERNAL,
+ server_m->get_connection_data()->eapol_auth_failure() );
+ }
+ else
+ {
+ DEBUG( "core_eapol_handler_c::complete_disassociation() - completing request (authentication not started)" );
+ server_m->request_complete(
+ REQUEST_ID_CORE_INTERNAL,
+ core_error_ok );
+ }
+
+ return core_error_ok;
+ }
+
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//
void core_eapol_handler_c::handle_error(
wlan_eapol_if_error_e errorcode,
wlan_eapol_if_message_type_function_e function )
@@ -974,8 +1062,18 @@
return;
}
+ server_m->get_connection_data()->set_eapol_auth_failure(
+ eapol_wlan_authentication_state_to_error( state ) );
+
+ if ( server_m->get_connection_data()->is_eapol_disconnecting() )
+ {
+ DEBUG( "core_ap_data_c::instance() - disassociation pending, request cannot be completed yet" );
+
+ return;
+ }
+
bool_t is_authentication_started( server_m->get_connection_data()->is_eapol_authenticating() );
-
+
DEBUG( "core_eapol_handler_c::handle_wlan_authentication_state() - marking is_eapol_authenticating as false" );
server_m->get_connection_data()->set_eapol_authenticating(
false_t );
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_operation_handle_bss_lost.cpp Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_operation_handle_bss_lost.cpp Fri Jun 11 15:34:34 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 33 %
+* %version: 34 %
*/
#include "core_operation_handle_bss_lost.h"
@@ -151,34 +151,6 @@
}
/**
- * If the connection is lost when EAPOL is doing (re-)authentication,
- * EAPOL must be notified.
- */
- if ( server_m->get_connection_data()->is_eapol_authenticating() &&
- ( server_m->get_connection_data()->iap_data().is_eap_used() ||
- server_m->get_connection_data()->iap_data().is_wapi_used() ) )
- {
- network_id_c network_id(
- &bssid.addr[0],
- MAC_ADDR_LEN,
- &server_m->own_mac_addr().addr[0],
- MAC_ADDR_LEN,
- server_m->get_eapol_instance().ethernet_type() );
-
- DEBUG( "core_operation_handle_bss_lost_c::next_state() - marking is_eapol_authenticating as false" );
- server_m->get_connection_data()->set_eapol_authenticating(
- false_t );
-
- DEBUG6( "core_operation_handle_bss_lost_c::next_state() - EAPOL disassociation from BSSID %02X:%02X:%02X:%02X:%02X:%02X",
- bssid.addr[0], bssid.addr[1], bssid.addr[2],
- bssid.addr[3], bssid.addr[4], bssid.addr[5] );
-
- server_m->get_eapol_instance().disassociation( &network_id );
- }
-
- operation_state_m = core_state_set_tx_level;
-
- /**
* Check the channels that were previously reported to be active.
*/
server_m->get_scan_list().get_channels_by_ssid(
@@ -201,6 +173,47 @@
server_m->get_scan_list().remove_entries_by_bssid(
bssid );
+ /**
+ * If the connection is lost when EAPOL is doing (re-)authentication,
+ * EAPOL must be notified.
+ */
+ if ( ( server_m->get_connection_data()->is_eapol_authenticating() ||
+ reason_m == core_bss_lost_reason_failed_reauthentication ) &&
+ ( server_m->get_connection_data()->iap_data().is_eap_used() ||
+ server_m->get_connection_data()->iap_data().is_wapi_used() ) )
+ {
+ network_id_c network_id(
+ &bssid.addr[0],
+ MAC_ADDR_LEN,
+ &server_m->own_mac_addr().addr[0],
+ MAC_ADDR_LEN,
+ server_m->get_eapol_instance().ethernet_type() );
+
+ DEBUG( "core_operation_handle_bss_lost_c::next_state() - marking is_eapol_authenticating as false" );
+ server_m->get_connection_data()->set_eapol_authenticating(
+ false_t );
+
+ DEBUG6( "core_operation_handle_bss_lost_c::next_state() - EAPOL disassociation from BSSID %02X:%02X:%02X:%02X:%02X:%02X",
+ bssid.addr[0], bssid.addr[1], bssid.addr[2],
+ bssid.addr[3], bssid.addr[4], bssid.addr[5] );
+ DEBUG( "core_operation_handle_bss_lost_c::next_state() - marking is_eapol_disconnecting as true" );
+ server_m->get_connection_data()->set_eapol_disconnecting(
+ true );
+ server_m->get_connection_data()->set_eapol_auth_failure(
+ core_error_eapol_failure );
+
+ server_m->get_eapol_instance().disassociation( &network_id );
+ operation_state_m = core_state_eapol_disassociated;
+
+ return core_error_request_pending;
+ }
+
+ return goto_state( core_state_eapol_disassociated );
+ }
+ case core_state_eapol_disassociated:
+ {
+ operation_state_m = core_state_set_tx_level;
+
server_m->get_core_settings().roam_metrics().set_roam_ts_userdata_disabled();
drivers_m->disable_user_data(
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_operation_release.cpp Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_operation_release.cpp Fri Jun 11 15:34:34 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 17 %
+* %version: 18 %
*/
#include "core_operation_release.h"
@@ -175,10 +175,21 @@
DEBUG6( "core_operation_release_c::next_state() - EAPOL disassociation from BSSID %02X:%02X:%02X:%02X:%02X:%02X",
bssid.addr[0], bssid.addr[1], bssid.addr[2],
bssid.addr[3], bssid.addr[4], bssid.addr[5] );
+ DEBUG( "core_operation_release_c::next_state() - marking is_eapol_disconnecting as true" );
+ server_m->get_connection_data()->set_eapol_disconnecting(
+ true );
server_m->get_eapol_instance().disassociation( &network );
+ operation_state_m = core_state_eapol_disassociated;
+
+ return core_error_request_pending;
}
+ return goto_state( core_state_eapol_disassociated );
+ }
+ case core_state_eapol_disassociated:
+ {
+ DEBUG( "core_operation_release_c::next_state() - core_state_eapol_disassociated" );
// disable user data
drivers_m->disable_user_data( request_id_m );
operation_state_m = core_state_disable_user_data;
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_operation_roam.cpp Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_operation_roam.cpp Fri Jun 11 15:34:34 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 76.1.2 %
+* %version: 76.1.3 %
*/
#include "core_operation_roam.h"
@@ -433,6 +433,12 @@
bssid.addr[0], bssid.addr[1], bssid.addr[2],
bssid.addr[3], bssid.addr[4], bssid.addr[5] );
+ /**
+ * is_eapol_disconnecting is not updated here because this disassociation
+ * is for the previous AP and thus we don't really care when this
+ * request gets completed.
+ */
+
server_m->get_eapol_instance().disassociation( &network );
}
}
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_sub_operation_wpa_connect.cpp Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_sub_operation_wpa_connect.cpp Fri Jun 11 15:34:34 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 59 %
+* %version: 59.1.1 %
*/
#include "core_sub_operation_wpa_connect.h"
@@ -102,6 +102,8 @@
true_t );
server_m->get_connection_data()->set_eapol_auth_bssid(
ZERO_MAC_ADDR );
+ server_m->get_connection_data()->set_eapol_auth_failure(
+ core_error_ok );
eapol_auth_type_m = core_tools_c::eap_authentication_type(
server_m->get_connection_data()->iap_data(),
@@ -634,9 +636,17 @@
DEBUG6( "core_sub_operation_wpa_connect_c::next_state() - EAPOL disassociation from BSSID %02X:%02X:%02X:%02X:%02X:%02X",
current_bssid_m.addr[0], current_bssid_m.addr[1], current_bssid_m.addr[2],
current_bssid_m.addr[3], current_bssid_m.addr[4], current_bssid_m.addr[5] );
+ DEBUG( "core_sub_operation_wpa_connect_c::next_state() - marking is_eapol_disconnecting as true" );
+ server_m->get_connection_data()->set_eapol_disconnecting(
+ true );
server_m->get_eapol_instance().disassociation( &network );
-
+ operation_state_m = core_state_user_cancel_disassociated;
+
+ break;
+ }
+ case core_state_user_cancel_disassociated:
+ {
/** The connection attempt failed, we are no longer connected. */
is_connected_m = false_t;
@@ -770,10 +780,28 @@
// ---------------------------------------------------------------------------
//
core_error_e core_sub_operation_wpa_connect_c::disassociate(
- network_id_c * /*receive_network_id*/,
+ network_id_c * receive_network_id,
const bool_t /* self_disassociation */ )
{
DEBUG( "core_sub_operation_wpa_connect_c::disassociate()" );
+
+ const core_mac_address_s bssid(
+ receive_network_id->source() );
+ DEBUG6( "core_sub_operation_wpa_connect_c::disassociate() - function BSSID is %02X:%02X:%02X:%02X:%02X:%02X",
+ bssid.addr[0], bssid.addr[1], bssid.addr[2],
+ bssid.addr[3], bssid.addr[4], bssid.addr[5] );
+ DEBUG6( "core_sub_operation_wpa_connect_c::disassociate() - EAPOL disassociation from BSSID %02X:%02X:%02X:%02X:%02X:%02X",
+ current_bssid_m.addr[0], current_bssid_m.addr[1], current_bssid_m.addr[2],
+ current_bssid_m.addr[3], current_bssid_m.addr[4], current_bssid_m.addr[5] );
+ if( operation_state_m == core_state_req_state_notification &&
+ bssid == current_bssid_m )
+ {
+ DEBUG( "core_sub_operation_wpa_connect_c::disassociate() - marking is_eapol_disconnecting as true" );
+ server_m->get_connection_data()->set_eapol_disconnecting(
+ true );
+
+ server_m->get_eapol_instance().disassociation( receive_network_id );
+ }
return core_error_ok;
}
@@ -932,6 +960,18 @@
return core_error_ok;
}
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+//
+core_error_e core_sub_operation_wpa_connect_c::complete_disassociation(
+ network_id_c * /* receive_network_id */ )
+ {
+ DEBUG( "core_sub_operation_wpa_connect_c::complete_disassociation()" );
+
+ ASSERT( false_t );
+
+ return core_error_ok;
+ }
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
@@ -960,9 +1000,10 @@
asynch_goto( core_state_init, CORE_TIMER_IMMEDIATELY );
}
- else if ( function == wlan_eapol_if_message_type_function_complete_association
+ else if ( ( function == wlan_eapol_if_message_type_function_complete_association
|| function == wlan_eapol_if_message_type_function_complete_reassociation
- || function == wlan_eapol_if_message_type_function_complete_wpx_fast_roam_reassociation )
+ || function == wlan_eapol_if_message_type_function_complete_wpx_fast_roam_reassociation ) &&
+ eapol_auth_type_m == wlan_eapol_if_eapol_key_authentication_type_wpx_fast_roam )
{
DEBUG( "core_sub_operation_wpa_connect_c::handle_error() - (WPX fast-roam) (re-)association failed" );
asynch_goto( core_state_req_association_failed, CORE_TIMER_IMMEDIATELY );
@@ -1011,23 +1052,14 @@
DEBUG6( "core_sub_operation_wpa_connect_c::notify() - EAPOL disassociation from BSSID %02X:%02X:%02X:%02X:%02X:%02X",
current_bssid_m.addr[0], current_bssid_m.addr[1], current_bssid_m.addr[2],
current_bssid_m.addr[3], current_bssid_m.addr[4], current_bssid_m.addr[5] );
+ DEBUG( "core_sub_operation_wpa_connect_c::next_state() - marking is_eapol_disconnecting as true" );
+ server_m->get_connection_data()->set_eapol_disconnecting(
+ true );
+ server_m->get_connection_data()->set_eapol_auth_failure(
+ core_error_eapol_failure );
server_m->get_eapol_instance().disassociation( &network );
- if ( indication != core_am_indication_wlan_media_disconnect )
- {
- DEBUG( "core_sub_operation_wpa_connect_c::notify() - marking is_eapol_authenticating as false" );
- server_m->get_connection_data()->set_eapol_authenticating(
- false_t );
- DEBUG( "core_sub_operation_wpa_connect_c::notify() - marking is_eapol_authentication_started as false" );
- server_m->get_connection_data()->set_eapol_authentication_started(
- false_t );
-
- asynch_goto( core_state_bss_lost );
-
- return true_t;
- }
-
/**
* EAPOL indication will move the state machine forward.
*/
--- a/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_wlan_eapol_if_message.cpp Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_wlan_eapol_if_message.cpp Fri Jun 11 15:34:34 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 13 %
+* %version: 14 %
*/
#include "core_wlan_eapol_if_message.h"
@@ -4059,4 +4059,43 @@
return core_error_ok;
}
-
+core_error_e core_wlan_eapol_if_function_c::parse_complete_disassociation(
+ network_id_c * receive_network_id )
+ {
+ DEBUG( "core_wlan_eapol_if_function_c::parse_complete_disassociation()" );
+ ASSERT( receive_network_id );
+
+ core_error_e error( core_error_ok );
+
+ first();
+ if ( is_done() )
+ {
+ DEBUG( "core_wlan_eapol_if_function_c::parse_complete_disassociation() - message is empty" );
+ return core_error_not_found;
+ }
+
+ // Check function
+ if ( current()->get_parameter_type() != wlan_eapol_if_message_type_function )
+ {
+ return core_error_not_found;
+ }
+
+ u32_t function_value(0);
+ current()->get_parameter_data( &function_value );
+ wlan_eapol_if_message_type_function_e func( static_cast<wlan_eapol_if_message_type_function_e>( function_value ) );
+ if ( func != wlan_eapol_if_message_type_function_complete_disassociation )
+ {
+ return core_error_not_found;
+ }
+
+ next();
+
+ // Check function parameters
+ error = parse_network_id( receive_network_id );
+ if ( error != core_error_ok )
+ {
+ return error;
+ }
+
+ return core_error_ok;
+ }
--- a/wlan_bearer/wlannwif/eabi/wlanprotou.def Thu May 27 14:33:33 2010 +0300
+++ b/wlan_bearer/wlannwif/eabi/wlanprotou.def Fri Jun 11 15:34:34 2010 +0300
@@ -53,7 +53,7 @@
_ZThn12_N27CWlanMetaConnectionProviderD1Ev @ 52 NONAME ; #<thunk>#
_ZThn20_N14CLANLinkCommon9ReceivedLERKN8Messages13TRuntimeCtxIdERKNS0_7TNodeIdERNS0_14TSignatureBaseE @ 53 NONAME ; #<thunk>#
_ZThn20_N27CWlanMetaConnectionProvider9ReceivedLERKN8Messages13TRuntimeCtxIdERKNS0_7TNodeIdERNS0_14TSignatureBaseE @ 54 NONAME ; #<thunk>#
- _ZThn96_N14CLANLinkCommon11GetControlLERK6TDesC8 @ 55 NONAME ; #<thunk>#
- _ZThn96_N14CLANLinkCommon5BindLERK6TDesC8PN5ESock18MUpperDataReceiverEPNS3_13MUpperControlE @ 56 NONAME ; #<thunk>#
- _ZThn96_N14CLANLinkCommon6UnbindEPN5ESock18MUpperDataReceiverEPNS0_13MUpperControlE @ 57 NONAME ; #<thunk>#
+ _ZThn100_N14CLANLinkCommon11GetControlLERK6TDesC8 @ 55 NONAME ; #<thunk>#
+ _ZThn100_N14CLANLinkCommon5BindLERK6TDesC8PN5ESock18MUpperDataReceiverEPNS3_13MUpperControlE @ 56 NONAME ; #<thunk>#
+ _ZThn100_N14CLANLinkCommon6UnbindEPN5ESock18MUpperDataReceiverEPNS0_13MUpperControlE @ 57 NONAME ; #<thunk>#
--- a/wlan_info/wlan_metadata/wlan_metadata.mrp Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-
-component wlan_metadata
-source \sf\os\wlan\wlan_info\wlan_metadata
-source \sf\os\wlan\package_definition.xml
-source \sf\os\wlan\distribution.policy.s60
-notes_source \component_defs\release.src
-ipr T
--- a/wlanapitest/wlanhaitest/common/inc/DataWrapperBase.h Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-#ifndef DATA_WRAPPER_BASE_H
-#define DATA_WRAPPER_BASE_H
-
-// EPOC includes
-#include <datawrapper.h>
-#define SECS_TO_MS(x) (x*1000000)
-
-_LIT(KConsname, "Test Console");
-
-class CDataWrapperBase : public CDataWrapper
- {
-public:
- class TEnumEntryTable
- {
- public:
- const TDesC& iString;
- TInt iValue;
- };
-
-public:
- TBool GetBoolFromConfig(const TDesC& aSectName,const TDesC& aKeyName,TBool& aResult);
- TBool GetIntFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult);
- TBool GetStringFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult);
- TBool GetHexFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult);
- TBool GetUintFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TUint& aResult);
- TBool KeyPress();
- void Timedelay(TInt aTimeoutInSecs);
- virtual void InitialiseL();
- inline RFs& FileServer() { return iFs; }
- inline CConsoleBase* GetConsole() { return(Console::NewL(KConsname,TSize(KConsFullScreen,KConsFullScreen)));}
- void GetValidationBool(const TDesC& aSection, TInt aValue, TBool aForceValidation, const TDesC& aErrorMessage);
- void GetValidationInt(const TDesC& aSection, TInt aValue, TBool aForceValidation, const TDesC& aErrorMessage);
- void GetValidationUint(const TDesC& aSection, TInt aValue, TBool aForceValidation, const TDesC& aErrorMessage);
- TBool GetArrayFromConfig(const TDesC& aSectName, const TDesC& aKeyName, RPointerArray<HBufC>& aResult);
- TBool GetEnumFromConfig(const TDesC& aSectName, const TDesC& aKeyName, const TEnumEntryTable* aTable, TInt& aResult);
-
-protected:
- CDataWrapperBase();
- virtual ~CDataWrapperBase();
-
-private:
- TBool GetCommandStringParameterL(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult);
- TBool KeyCheck();
-
-private:
- // Included ini files
- RPointerArray<CIniData> iInclude;
- RPointerArray<HBufC> iBuffer;
- RFs iFs;
- RTimer iTimer;
- };
-
-#endif // DATA_WRAPPER_BASE_H
--- a/wlanapitest/wlanhaitest/common/src/DataWrapperBase.cpp Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,517 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-#include "datawrapperbase.h"
-
-/*@{*/
-/// Constant Literals used.
-_LIT(KPrefixHex, "0x");
-_LIT(KPrefixOctal, "0");
-_LIT(KSuffixBinary, "b");
-
-_LIT(KIncludeSection, "include");
-_LIT(KFile, "file%d");
-_LIT(KMatch, "*{*,*}*");
-_LIT(KStart, "{");
-_LIT(KSeparator, ",");
-_LIT(KEnd, "}");
-_LIT(KDataRead, "INI READ : %S %S %S");
-_LIT(KLogMissingParameter, "Missing parameter '%S'");
-_LIT(KExpected, "expected");
-/*@}*/
-
-CDataWrapperBase::CDataWrapperBase()
-: CDataWrapper()
- {
- }
-
-/**
- * Public destructor
- */
-CDataWrapperBase::~CDataWrapperBase()
- {
- iInclude.ResetAndDestroy();
- iBuffer.ResetAndDestroy();
- iFs.Close();
- }
-
-void CDataWrapperBase::InitialiseL()
- {
- iTimer.CreateLocal();
- CDataWrapper::InitialiseL();
- TBuf<KMaxTestExecuteCommandLength> tempStore;
- TPtrC fileName;
- TBool moreData=ETrue;
- TBool index=0;
- while ( moreData )
- {
- tempStore.Format(KFile(), ++index);
- moreData=GetStringFromConfig(KIncludeSection, tempStore, fileName);
-
- if (moreData)
- {
- CIniData* iniData=CIniData::NewL(fileName);
- CleanupStack::PushL(iniData);
- iInclude.Append(iniData);
- CleanupStack::Pop(iniData);
- }
- }
- User::LeaveIfError(iFs.Connect());
- }
-
-/**
- * Reads the value present from the test steps ini file within the mentioned section name and key name
- * Copies the value to the TBool reference passed in possible values TRUE, FALSE
- * @param aSectName - Section within the test steps ini file
- * @param aKeyName - Name of a key within a section
- * @return aResult - The value of the boolean
- * @return TBool - ETrue for found, EFalse for not found
- */
-TBool CDataWrapperBase::GetBoolFromConfig(const TDesC& aSectName,const TDesC& aKeyName,TBool& aResult)
- {
- TBool ret=EFalse;
- TPtrC result;
- TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
- if ( err != KErrNone )
- {
- ret=EFalse;
- }
- if ( ret )
- {
- _LIT(KTrue,"true");
- aResult=(result.FindF(KTrue) != KErrNotFound);
- }
-
- return ret;
- }
-
-/**
- * Reads the value present from the test steps ini file within the mentioned section name and key name
- * Copies the value to the TInt reference passed in
- * @param aSectName - Section within the test steps ini file
- * @param aKeyName - Name of a key within a section
- * @return aResult - The value of the integer
- * @return TBool - ETrue for found, EFalse for not found
- */
-TBool CDataWrapperBase::GetIntFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult)
- {
- TPtrC result;
- TBool ret=EFalse;
- TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
- if ( err != KErrNone )
- {
- ret=EFalse;
- }
- if ( ret )
- {
- TLex lex(result);
- ret=(lex.Val(aResult)==KErrNone);
- }
-
- return ret;
- }
-
-/**
- * Reads the value present from the test steps ini file within the mentioned section name and key name
- * Copies the value to the TPtrC reference passed in
- * @param aSectName - Section within the test steps ini file
- * @param aKeyName - Name of a key within a section
- * @return aResult - Reference to the string on the heap
- * @return TBool - ETrue for found, EFalse for not found
- */
-TBool CDataWrapperBase::GetStringFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult)
- {
- TBool ret=EFalse;
- TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, aResult));
- if ( err != KErrNone )
- {
- ret=EFalse;
- }
- return ret;
- }
-
-/**
- * Reads the value present from the test steps ini file within the mentioned section name and key name
- * Copies the value to the TInt reference passed in. The value can optionally be prefixed with 0x
- * @param aSectName - Section within the test steps ini file
- * @param aKeyName - Name of a key within a section
- * @return aResult - The integer value of the Hex input
- * @return TBool - ETrue for found, EFalse for not found
- */
-TBool CDataWrapperBase::GetHexFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult)
- {
- TPtrC result;
- TBool ret=EFalse;
- TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
- if ( err != KErrNone )
- {
- ret=EFalse;
- }
- if ( ret )
- {
- TLex lex;
- if( result.FindC(KPrefixHex)==KErrNone )
- {
- lex=result.Mid(KPrefixHex().Length());
- }
- else
- {
- lex=result;
- }
- ret=(lex.Val((TUint &)aResult, EHex)==KErrNone);
- }
-
- return ret;
- }
-
-/**
- * Reads the value present from the test steps ini file within the mentioned section name and key name
- * Copies the value to the TUint reference passed in.
- * If the value is prefixed with 0x the value is read as a hexadecimal value
- * If the value is suffixed with b the value is read as a binary value
- * If the value is prefixed with a 0 the value is read as an octal value
- * If it does not match the above it is read in as an integer
- * @param aSectName - Section within the test steps ini file
- * @param aKeyName - Name of a key within a section
- * @return aResult - The integer value of the Hex input
- * @return TBool - ETrue for found, EFalse for not found
- */
-TBool CDataWrapperBase::GetUintFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TUint& aResult)
- {
- TPtrC result;
- TBool ret=EFalse;
- TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
- if ( err != KErrNone )
- {
- ret=EFalse;
- }
- if ( ret )
- {
- TLex lex(result);
- if( result.FindC(KPrefixHex)==KErrNone )
- {
- lex=result.Mid(KPrefixHex().Length());
- ret=(lex.Val(aResult, EHex)==KErrNone);
- }
- else
- {
- TInt binarySuffixPosition=result.Length()-KSuffixBinary().Length();
- if ( result.FindC(KSuffixBinary)==binarySuffixPosition )
- {
- lex=result.Left(binarySuffixPosition);
- ret=(lex.Val(aResult, EBinary)==KErrNone);
- }
- else
- {
- if( result.FindC(KPrefixOctal)==KErrNone )
- {
- ret=(lex.Val(aResult, EOctal)==KErrNone);
- }
- else
- {
- TInt intResult;
- ret=(lex.Val(intResult)==KErrNone);
- if ( ret )
- {
- aResult=(TUint)intResult;
- }
- }
- }
- }
- }
-
- return ret;
- }
-
-TBool CDataWrapperBase::GetCommandStringParameterL(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult)
- {
- TBool ret=EFalse;
-
- if ( aSectName.Length()!=0 )
- {
- ret=CDataWrapper::GetStringFromConfig(aSectName, aKeyName, aResult);
-
- for ( TInt index=iInclude.Count(); (index>0) && (!ret); )
- {
- ret=iInclude[--index]->FindVar(aSectName, aKeyName, aResult);
- }
- }
-
- if ( ret )
- {
- if ( aResult.Match(KMatch)!=KErrNotFound )
- {
- // We have an entry of the format
- // entry =*{section,entry}*
- // where * is one or more characters
- // We need to construct this from other data in the ini file replacing {*,*}
- // with the data from
- // [section]
- // entry =some_value
- HBufC* buffer=HBufC::NewLC(aResult.Length());
- buffer->Des().Copy(aResult);
-
- TInt startLength=KStart().Length();
- TInt sparatorLength=KSeparator().Length();
- TInt endLength=KEnd().Length();
- TInt bufferLength;
- TInt start;
- TInt sparator;
- TInt end;
- TPtrC remaining;
- TLex lex;
- do
- {
- bufferLength=buffer->Length();
- start=buffer->Find(KStart);
-
- remaining.Set(buffer->Des().Right(bufferLength-start-startLength));
- sparator=remaining.Find(KSeparator);
- remaining.Set(remaining.Right(remaining.Length()-sparator-sparatorLength));
- sparator += (start + startLength);
-
- end=remaining.Find(KEnd) + sparator + sparatorLength;
-
- TPtrC sectionName(buffer->Ptr()+start+startLength, sparator-start-startLength);
- TPtrC keyName(buffer->Ptr()+sparator+sparatorLength, end-sparator-sparatorLength);
- sectionName.Set(TLex(sectionName).NextToken());
- keyName.Set(TLex(keyName).NextToken());
-
- TInt entrySize=0;
- TPtrC entryData;
- TBool found=CDataWrapper::GetStringFromConfig(sectionName, keyName, entryData);
- for ( TInt index=iInclude.Count(); (index>0) && (!found); )
- {
- found=iInclude[--index]->FindVar(sectionName, keyName, entryData);
- }
- if ( found )
- {
- entrySize=entryData.Length();
- }
-
- TInt newLength=start + bufferLength - end - endLength + entrySize;
- HBufC* bufferNew=HBufC::NewLC(newLength);
- bufferNew->Des().Copy(buffer->Ptr(), start);
- if ( entrySize>0 )
- {
- bufferNew->Des().Append(entryData);
- }
- bufferNew->Des().Append(buffer->Ptr() + end + endLength, bufferLength - end - endLength);
- CleanupStack::Pop(bufferNew);
- CleanupStack::PopAndDestroy(buffer);
- buffer=bufferNew;
- CleanupStack::PushL(buffer);
- }
- while ( buffer->Match(KMatch)!=KErrNotFound );
- iBuffer.Append(buffer);
- CleanupStack::Pop(buffer);
- aResult.Set(*buffer);
- INFO_PRINTF4(KDataRead, &aSectName, &aKeyName , &aResult);
- }
- }
-
- return ret;
- }
-
-
-/**
- *Utility function to produce time delay
- * @param aTimeoutInSecs Times in micro seconds
- */
-void CDataWrapperBase::Timedelay(TInt aTimeoutInSecs)
- {
- TRequestStatus status;
- iTimer.After(status, aTimeoutInSecs);
- User::WaitForRequest(status);
- }
-
-
-/** Validates the returned valua as a Bool. Compares aValue with the expected result in the ini file and Sets the block result to EFail if not equal.
- * @param aSection - Section within the ini file to read the expected value
- * @param aValue - The value we need to validate
- * @param aForceValidation - ETrue forces validation if there's a missing parameter.
- * @param aErrorMessage - Contains a descriptor with a custom error message
- * @return - Print error messages to log file
- * @return - Sets test block result
- */
-void CDataWrapperBase::GetValidationBool(const TDesC& aSection, TInt aValue, TBool aForceValidation, const TDesC& aErrorMessage)
- {
- TBool expectedValue;
- TBool ret=GetBoolFromConfig(aSection, KExpected(), expectedValue);
- if ( !ret )
- {
- if ( aForceValidation )
- {
- ERR_PRINTF2(KLogMissingParameter, & KExpected);
- SetBlockResult(EFail);
- }
- }
- else
- {
- if ( aValue!=expectedValue )
- {
- SetBlockResult(EFail);
- ERR_PRINTF1(aErrorMessage);
- ERR_PRINTF3(_L("Retrived Value(%d) != expectedValue(%d)"), aValue, expectedValue);
- }
- }
- }
-
-
-/**
- * Validates the returned valua as a TInt. Compares aValue with the expected result in the ini file and Sets the block result to EFail if not equal.
- * @param aSection - Section within the ini file to read the expected value
- * @param aValue - The value we need to validate
- * @param aForceValidation - ETrue forces validation if there's a missing parameter.
- * @param aErrorMessage - Contains a descriptor with a custom error message
- * @return - Print error messages to log file
- * @return - Sets test block result
- */
-void CDataWrapperBase::GetValidationInt(const TDesC& aSection, TInt aValue, TBool aForceValidation, const TDesC& aErrorMessage)
- {
- TInt expectedValue;
- TBool ret=GetIntFromConfig(aSection, KExpected(), expectedValue);
- if ( !ret )
- {
- if ( aForceValidation )
- {
- ERR_PRINTF2(KLogMissingParameter, &KExpected());
- SetBlockResult(EFail);
- }
- }
- else
- {
- if ( aValue!=expectedValue )
- {
- SetBlockResult(EFail);
- ERR_PRINTF1(aErrorMessage);
- ERR_PRINTF3(_L("Retrived Value(%d) != expectedValue(%d)"), aValue, expectedValue);
- }
- }
- }
-
-/**
- * Validates the returned valua as a TUint. Compares aValue with the expected result in the ini file and Sets the block result to EFail if not equal.
- * @param aSection - Section within the ini file to read the expected value
- * @param aValue - The value we need to validate
- * @param aForceValidation - ETrue forces validation if there's a missing parameter.
- * @param aErrorMessage - Contains a descriptor with a custom error message
- * @return - Print error messages to log file
- * @return - Sets test block result
- */
-void CDataWrapperBase::GetValidationUint(const TDesC& aSection, TInt aValue, TBool aForceValidation, const TDesC& aErrorMessage)
- {
- TUint expectedValue;
- TBool ret=GetUintFromConfig(aSection, KExpected(), expectedValue);
- if ( !ret )
- {
- if ( aForceValidation )
- {
- ERR_PRINTF2(KLogMissingParameter, &KExpected());
- SetBlockResult(EFail);
- }
- }
- else
- {
- if ( aValue!=expectedValue )
- {
- SetBlockResult(EFail);
- ERR_PRINTF1(aErrorMessage);
- ERR_PRINTF3(_L("Retrived Value(%d) != expectedValue(%d)"), aValue, expectedValue);
- }
- }
- }
-
-
-/**
- * Return array of string parameters i.e. key=a1,a2,a3 returns array which contains
- * String a1, a2 and a3.
- * @return ret - EFalse if can't get a String parameter from Config file. ETrue if KErrNone
- */
-TBool CDataWrapperBase::GetArrayFromConfig(const TDesC& aSectName, const TDesC& aKeyName, RPointerArray<HBufC>& aResult)
- {
- TBool ret=EFalse;
- TPtrC completeArray;
-
- TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, completeArray));
- if ( err != KErrNone )
- {
- ret=EFalse;
- }
-
- TLex16 lex(completeArray); // Here we have the array as a string i.e. "a1,a2,a3"
- TBuf<256> buf;
- TChar chr;
-
- while(!lex.Eos())
- {
- chr = lex.Get();
- // Check if there was a list separator
- if (chr == ',')
- {
- HBufC* param = buf.AllocLC();
- buf.Zero();
- aResult.Append(param);
- CleanupStack::Pop(param); // pointer to buf is stored in RPointerArray
- }
- // If not separator character we can store the character into array
- else
- {
- buf.Append(chr);
- }
- }
- // Remember to put last token into array (,a3)
- HBufC* param = buf.AllocLC();
- aResult.Append(param);
- CleanupStack::Pop(param);
-
- return ret;
- }
-
-
-TBool CDataWrapperBase::GetEnumFromConfig(const TDesC& aSectName, const TDesC& aKeyName, const TEnumEntryTable* aTable, TInt& aResult)
- {
- TPtrC str;
- TBool ret=GetStringFromConfig(aSectName, aKeyName, str);
-
- if ( ret )
- {
- TBool found=EFalse;
- TInt index=0;
- while ( (aTable[index].iValue!=-1) && !found )
- {
- if ( aTable[index].iString==str )
- {
- found=ETrue;
- aResult=aTable[index].iValue;
- }
- else
- {
- ++index;
- }
- }
-
- if ( !found )
- {
- ret=GetIntFromConfig(aSectName, aKeyName, aResult);
- }
- }
-
- return ret;
- }
-
--- a/wlanapitest/wlanhaitest/group/bld.inf Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-//
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-//
-
-#include "../wlan/group/bld.inf"
--- a/wlanapitest/wlanhaitest/group/device.cfg Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-//
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-//
-
-
-// Used within the build process to export the correct files for the supported devices
-// Uncomment only one of the devices definied in listed below
-
-#define TEST_DEVICE_DEVLON52
-//#define TEST_DEVICE_TUBE
--- a/wlanapitest/wlanhaitest/group/release.txt Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-NOTESRC_RELEASER
-Nokia Corporation
-
-NOTESRC_RELEASE_REASON
-WLAN SALT
--- a/wlanapitest/wlanhaitest/group/testdriversetup.bat Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-@rem
-@rem Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-@rem All rights reserved.
-@rem This component and the accompanying materials are made available
-@rem under the terms of "Eclipse Public License v1.0"
-@rem which accompanies this distribution, and is available
-@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-@rem
-@rem Initial Contributors:
-@rem Nokia Corporation - initial contribution.
-@rem
-@rem Contributors:
-@rem
-@rem Description:
-@rem
-
-perl testdriversetup.pl
--- a/wlanapitest/wlanhaitest/group/testdriversetup.pl Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-#
-use Cwd;
-
-my $theEpocRoot=$ENV{EPOCROOT};
-my $epoc32Location="$theEpocRoot.\\epoc32";
-
-my $currentDirectory=cwd;
-$currentDirectory =~ s/Group//i;
-$currentDirectory =~ s/\//\\/g;
-
-my $currentDrive = substr($currentDirectory,0,2);
-
-my $cmd="TestDriver config";
-my $suite="file:/$currentDrive$epoc32Location\\testdriver\\salt\\wlanhai.driver";
-$suite =~ s.\\./.g;
-$suite =~ s\/./\/\g;
-
-$cmd .= " --bldclean OFF";
-$cmd .= " --bldmake OFF";
-$cmd .= " -e $currentDrive$theEpocRoot";
-$cmd .= " -x $currentDrive$epoc32Location\\testdriver\\salt";
-$cmd .= " --repos $currentDrive$epoc32Location\\testdriver\\Repository";
-$cmd .= " -c $currentDrive$epoc32Location\\testdriver\\Results";
-$cmd .= " -i $currentDirectory";
-$cmd .= " -s $suite";
-$cmd .= " --source $currentDirectory";
-$cmd .= " --tp $currentDirectory";
-$cmd .= " --testexec auto";
-$cmd .= " --statlite false";
-$cmd .= " --teflite true";
-$cmd .= " --commdb overwrite";
-system("$cmd");
--- a/wlanapitest/wlanhaitest/group/wlanhaitest.mrp Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#
-# Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-#
-component wlanhaitest
-source \sf\os\wlan\wlanapitest\wlanhaitest
-notes_source \sf\os\wlan\wlanapitest\wlanhaitest\group\release.txt
-ipr T
--- a/wlanapitest/wlanhaitest/testsuites/group/bld.inf Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-//
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-//
-
-PRJ_TESTEXPORTS
-../wlan/wlanhai.driver /epoc32/testdriver/salt/wlanhai.driver
\ No newline at end of file
--- a/wlanapitest/wlanhaitest/testsuites/wlan/wlanhai.driver Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<driver:driver xmlns:driver="http://www.symbian.com/TestDriver">
- <task name="wlanhai" timeout="0">
- <transferToSymbian>
- </transferToSymbian>
- <task name="wlan">
- <executeOnPC>
- <build testBuild="true" URI="${sourceroot}\group\">
- <componentName>t_wlan</componentName>
- </build>
- </executeOnPC>
- <transferToSymbian>
- <transfer move="false" PCPath="${epocroot}\epoc32\data\c\nt\wlan\t_wlan.ini" SymbianPath="$:\nt\wlan\t_wlan.ini"/>
- <transfer move="false" PCPath="${epocroot}\epoc32\data\c\nt\wlan\t_wlan_environment.ini" SymbianPath="$:\nt\wlan\t_wlan_environment.ini"/>
- </transferToSymbian>
- <task name="validation">
- <task name="manual">
- </task>
- <task name="automated">
- <task name="networking-wlan-validation-automated-instantiate" timeout="1000">
- <transferToSymbian>
- <transfer move="false" PCPath="${epocroot}\epoc32\data\c\nt\wlan\networking-wlan-validation-automated-instantiate.ini" SymbianPath="$:\nt\wlan\networking-wlan-validation-automated-instantiate.ini"/>
- </transferToSymbian>
- <executeOnSymbian>
- <testExecuteScript PCPath="${epocroot}\epoc32\data\c\nt\wlan\networking-wlan-validation-automated-instantiate.script" SymbianPath="$:\nt\wlan\networking-wlan-validation-automated-instantiate.script">
- <testCasesList operator="exclude">
- <testCase target="${epocroot}\epoc32\data\c\nt\wlan\t_wlan.tcs"/>
- </testCasesList>
- </testExecuteScript>
- </executeOnSymbian>
- </task>
- <task name="networking-wlan-validation-automated-connection" timeout="1000">
- <transferToSymbian>
- <transfer move="false" PCPath="${epocroot}\epoc32\data\c\nt\wlan\networking-wlan-validation-automated-connection.ini" SymbianPath="$:\nt\wlan\networking-wlan-validation-automated-connection.ini"/>
- </transferToSymbian>
- <executeOnSymbian>
- <testExecuteScript PCPath="${epocroot}\epoc32\data\c\nt\wlan\networking-wlan-validation-automated-connection.script" SymbianPath="$:\nt\wlan\networking-wlan-validation-automated-connection.script">
- <testCasesList operator="exclude">
- <testCase target="${epocroot}\epoc32\data\c\nt\wlan\t_wlan.tcs"/>
- </testCasesList>
- </testExecuteScript>
- </executeOnSymbian>
- </task>
- <task name="networking-wlan-validation-automated-transfer" timeout="1000">
- <transferToSymbian>
- <transfer move="false" PCPath="${epocroot}\epoc32\data\c\nt\wlan\networking-wlan-validation-automated-transfer.ini" SymbianPath="$:\nt\wlan\networking-wlan-validation-automated-transfer.ini"/>
- </transferToSymbian>
- <executeOnSymbian>
- <testExecuteScript PCPath="${epocroot}\epoc32\data\c\nt\wlan\networking-wlan-validation-automated-transfer.script" SymbianPath="$:\nt\wlan\networking-wlan-validation-automated-transfer.script">
- <testCasesList operator="exclude">
- <testCase target="${epocroot}\epoc32\data\c\nt\wlan\t_wlan.tcs"/>
- </testCasesList>
- </testExecuteScript>
- </executeOnSymbian>
- </task>
- </task>
- </task>
- <task name="performance">
- <task name="manual">
- </task>
- <task name="automated">
- </task>
- </task>
- <task name="conformance" timeout="0">
- <task name="manual">
- </task>
- <task name="automated">
- </task>
- </task>
- <task name="stress">
- <task name="manual">
- </task>
- <task name="automated">
- </task>
- </task>
- </task>
- </task>
-</driver:driver>
--- a/wlanapitest/wlanhaitest/wlan/group/T_Wlan.mmp Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-#include <platform_paths.hrh>
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-TARGET t_wlan.exe
-TARGETTYPE exe
-UID 0x102863E6 0xA00041CB
-VENDORID 0x70000001
-
-capability All -Tcb
-
-SOURCEPATH ../src
-
-SOURCE ../../common/src/datawrapperbase.cpp
-SOURCE t_wlandriverserver.cpp
-SOURCE t_wlanmgmtclientdata.cpp
-SOURCE t_wlanscaninfodata.cpp
-SOURCE t_rsocketservdata.cpp
-SOURCE t_rconnectiondata.cpp
-SOURCE t_ccommsdatabasedata.cpp
-SOURCE t_ccommsdbtableviewdata.cpp
-SOURCE t_rsocketdata.cpp
-SOURCE t_rfiledata.cpp
-
-USERINCLUDE ../inc
-USERINCLUDE ../../common/inc
-
-
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/test
-SYSTEMINCLUDE /epoc32/include/kernel
-SYSTEMINCLUDE /epoc32/include/ecom
-SYSTEMINCLUDE /epoc32/include/mw
-
-LIBRARY testexecuteutils.lib
-LIBRARY testexecutelogclient.lib
-LIBRARY iniparser.lib
-LIBRARY euser.lib
-LIBRARY ecom.lib
-LIBRARY flogger.lib
-LIBRARY commdb.lib
-LIBRARY esock.lib
-LIBRARY insock.lib
-LIBRARY wlandbif.lib
-LIBRARY efsrv.lib
-LIBRARY eikcore.lib
-LIBRARY apengine.lib
-
-SMPSAFE
--- a/wlanapitest/wlanhaitest/wlan/group/bld.inf Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-//
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-//
-
-#include "../../group/device.cfg"
-#include "../../testsuites/group/bld.inf"
-
-PRJ_TESTEXPORTS
-t_wlan.iby /epoc32/rom/haitests/t_wlan.iby
-t_wlan_binaries.iby /epoc32/rom/haitests/t_wlan_binaries.iby
-t_wlan_testdata.iby /epoc32/rom/haitests/t_wlan_testdata.iby
-
-../pkg/t_wlan.bat c:/nt/wlan/t_wlan.bat
-
-../scripts/networking-wlan-validation-automated-connection.script c:/nt/wlan/networking-wlan-validation-automated-connection.script
-../scripts/networking-wlan-validation-automated-instantiate.script c:/nt/wlan/networking-wlan-validation-automated-instantiate.script
-../scripts/networking-wlan-validation-automated-transfer.script c:/nt/wlan/networking-wlan-validation-automated-transfer.script
-../testdata/networking-wlan-validation-automated-connection.ini c:/nt/wlan/networking-wlan-validation-automated-connection.ini
-../testdata/networking-wlan-validation-automated-instantiate.ini c:/nt/wlan/networking-wlan-validation-automated-instantiate.ini
-../testdata/networking-wlan-validation-automated-transfer.ini c:/nt/wlan/networking-wlan-validation-automated-transfer.ini
-../testdata/t_wlan_environment.ini c:/nt/wlan/t_wlan_environment.ini
-
-#if defined(TEST_DEVICE_DEVLON52)
-../testdata/devlon52/t_wlan.ini c:/nt/wlan/t_wlan.ini
-../testdata/devlon52/t_wlan.tcs c:/nt/wlan/t_wlan.tcs
-#endif
-
-#if defined(TEST_DEVICE_TUBE)
-../testdata/tube/t_wlan.ini c:/nt/wlan/t_wlan.ini
-../testdata/tube/t_wlan.tcs c:/nt/wlan/t_wlan.tcs
-#endif
-
-PRJ_TESTMMPFILES
-t_wlan.mmp
--- a/wlanapitest/wlanhaitest/wlan/group/t_wlan.iby Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-//
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-//
-
-#if (!defined __T_WLAN_IBY__)
-#define __T_WLAN_IBY__
-
-//Test Includes
-#include <..\haitests\t_wlan_binaries.iby>
-#include <..\haitests\t_wlan_testdata.iby>
-
-#endif
--- a/wlanapitest/wlanhaitest/wlan/group/t_wlan_binaries.iby Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-//
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-//
-
-#if (!defined __T_WLAN_BINARIES_IBY__)
-#define __T_WLAN_BINARIES_IBY__
-
-#if (!defined EKA2)
-file=\Epoc32\Release\armv5\urel\t_wlan.exe \sys\bin\t_wlan.exe
-#else
-file=\Epoc32\Release\armv5\urel\t_wlan.exe \sys\bin\t_wlan.exe
-#endif
-
-#endif
--- a/wlanapitest/wlanhaitest/wlan/group/t_wlan_testdata.iby Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-//
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-//
-
-#if (!defined __T_WLAN_TESTDATA_IBY__)
-#define __T_WLAN_TESTDATA_IBY__
-
-data=EPOCROOT##Epoc32\data\c\nt\wlan\t_wlan.bat nt\wlan\t_wlan.bat
-data=EPOCROOT##Epoc32\data\c\nt\wlan\networking-wlan-validation-automated-connection.script nt\wlan\networking-wlan-validation-automated-connection.script
-data=EPOCROOT##Epoc32\data\c\nt\wlan\networking-wlan-validation-automated-instantiate.script nt\wlan\networking-wlan-validation-automated-instantiate.script
-data=EPOCROOT##Epoc32\data\c\nt\wlan\networking-wlan-validation-automated-transfer.script nt\wlan\networking-wlan-validation-automated-transfer.script
-data=EPOCROOT##Epoc32\data\c\nt\wlan\networking-wlan-validation-automated-connection.ini nt\wlan\networking-wlan-validation-automated-connection.ini
-data=EPOCROOT##Epoc32\data\c\nt\wlan\networking-wlan-validation-automated-instantiate.ini nt\wlan\networking-wlan-validation-automated-instantiate.ini
-data=EPOCROOT##Epoc32\data\c\nt\wlan\networking-wlan-validation-automated-transfer.ini nt\wlan\networking-wlan-validation-automated-transfer.ini
-data=EPOCROOT##Epoc32\data\c\nt\wlan\t_wlan_environment.ini nt\wlan\t_wlan_environment.ini
-data=EPOCROOT##Epoc32\data\c\nt\wlan\t_wlan.ini nt\wlan\t_wlan.ini
-data=EPOCROOT##Epoc32\data\c\nt\wlan\t_wlan.tcs nt\wlan\t_wlan.tcs
-
-#endif
--- a/wlanapitest/wlanhaitest/wlan/group/user_input.oby Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-//
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-//
-
-file=\Epoc32\Release\armv5\urel\testexecutelogclient.dll \sys\bin\testexecutelogclient.dll
-file=\Epoc32\Release\armv5\urel\testexecutelogengine.exe \sys\bin\testexecutelogengine.exe
-file=\Epoc32\Release\armv5\urel\cinidata.dll \sys\bin\cinidata.dll
-file=\Epoc32\Release\armv5\urel\RFileLoggerClient.dll \sys\bin\RFileLoggerClient.dll
-file=\Epoc32\Release\armv5\urel\RFileLoggerServer.exe \sys\bin\RFileLoggerServer.exe
-file=\Epoc32\Release\armv5\urel\testexecute.exe \sys\bin\testexecute.exe
-file=\Epoc32\Release\armv5\urel\testexecuteutils.dll \sys\bin\testexecuteutils.dll
-data=\Epoc32\data\c\system\data\testexecute.ini \system\data\testexecute.ini
-
-file=\Epoc32\Release\armv5\urel\statapi.exe \sys\bin\statapi.exe
-data=\Epoc32\data\c\system\data\stat.ini \system\data\stat.ini
--- a/wlanapitest/wlanhaitest/wlan/inc/T_CCommsDatabaseData.h Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-#ifndef T_CCOMMSDATABASEDATA_H_
-#define T_CCOMMSDATABASEDATA_H_
-
-//User Includes
-#include "datawrapperbase.h"
-
-//Epoc includes
-#include <commdb.h>
-
-class CT_CCommsDatabaseData: public CDataWrapperBase
- {
-public:
- static CT_CCommsDatabaseData* NewL();
- virtual ~CT_CCommsDatabaseData();
-
-public:
- virtual TAny* GetObject();
- virtual TBool DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
-
-protected:
- CT_CCommsDatabaseData();
- void ConstructL();
-
-private:
- void DoCmdNewL();
- void DoCmdDestructor();
- void DestroyData();
-
-private:
- /**
- * Wrapped object
- */
- CCommsDatabase* iCommsDat;
-
- };
-
-#endif /*T_CCOMMSDATABASEDATA_H_*/
--- a/wlanapitest/wlanhaitest/wlan/inc/T_CCommsDbTableViewData.h Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-#ifndef T_CCOMMSDBTABLEVIEWDATA_H_
-#define T_CCOMMSDBTABLEVIEWDATA_H_
-
-//User Includes
-#include "datawrapperbase.h"
-
-//Epoc includes
-#include <commdb.h>
-
-class CT_CCommsDbTableViewData: public CDataWrapperBase
- {
-public:
- static CT_CCommsDbTableViewData* NewL();
- virtual ~CT_CCommsDbTableViewData();
-
-public:
- virtual TAny* GetObject();
- virtual TBool DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
-
-protected:
- CT_CCommsDbTableViewData();
- void ConstructL();
-
-private:
- void DoCmdNewL(const TTEFSectionName& aSection);
- void DoCmdDestructor();
- void DestroyData();
-
-private:
- /**
- * Wrapped object
- */
- CCommsDbTableView* iSearchView;
-
- };
-
-#endif /*T_CCOMMSDBTABLEVIEW_H_*/
--- a/wlanapitest/wlanhaitest/wlan/inc/T_RConnectionData.h Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-
-#ifndef T_RCONNECTIONDATA_H_
-#define T_RCONNECTIONDATA_H_
-
-//User Includes
-#include "datawrapperbase.h"
-
-//Epoc includes
-#include <es_sock.h> //RConnection
-
-class CT_RConnectionData: public CDataWrapperBase
- {
- public:
- static CT_RConnectionData* NewL();
- virtual ~CT_RConnectionData();
-
-public:
- virtual TAny* GetObject();
- virtual TBool DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
-
-protected:
- CT_RConnectionData();
- void ConstructL();
-
-private:
- void DoCmdOpen(const TTEFSectionName& aSection);
- void DoCmdStart(const TTEFSectionName& aSection);
- void DoCmdClose();
- void Close();
-
-private:
- /**
- * Wrapped object
- */
- RConnection* iConnection;
- };
-#endif /*T_RCONNECTIONDATA_H_*/
--- a/wlanapitest/wlanhaitest/wlan/inc/T_RFileData.h Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-
-#ifndef T_RFILEDATA_H_
-#define T_RFILEDATA_H_
-
-//User Includes
-#include "datawrapperbase.h"
-
-class CT_RFileData: public CDataWrapperBase
- {
-public:
- static CT_RFileData* NewL();
- virtual ~CT_RFileData();
-
-public:
- virtual TAny* GetObject();
- virtual TBool DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
-
-protected:
- CT_RFileData();
- void ConstructL();
-
-private:
- void DoCmdGenerateFile(const TTEFSectionName& aSection);
-
-private:
- /**
- * For create a file
- */
- RFile* iFile;
-
- /**
- * Handle for file server session
- */
- RFs iFs;
- };
-
-#endif /*T_RFILEDATA_H_*/
--- a/wlanapitest/wlanhaitest/wlan/inc/T_RSocketData.h Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-#ifndef T_RSOCKETDATA_H_
-#define T_RSOCKETDATA_H_
-
-//User Includes
-#include "datawrapperbase.h"
-
-//Epoc includes
-#include <es_sock.h> // RSocketServ, RConnection
-#include <in_sock.h> // KAfInet
-#include <activecallback.h>
-#include <f32file.h>
-
-
-class CT_RSocketData: public CDataWrapperBase
- {
-public:
- static CT_RSocketData* NewL();
- void RunL(CActive* aActive, TInt aIndex);
- virtual ~CT_RSocketData();
-
-public:
- virtual TAny* GetObject();
- void ErrorMessage(const TInt aMessage);
- virtual TBool DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
-
-protected:
- CT_RSocketData();
- void ConstructL();
-
-private:
- void DoCmdOpen(const TTEFSectionName& aSection);
- void DoCmdConnect(const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
- void DoCmdShutdown(const TInt aAsyncErrorIndex);
- void DoCmdClose();
- void DoCmdHttpGet();
- void DoCmdCheckSupportedRates(const TTEFSectionName& aSection);
- void DoCmdUploadSendHTTPPost(const TTEFSectionName& aSection);
- void CreateHTTPHeaderStart(TDes8& aRequest, TInt aDataSize, TDesC& aFileServer,TDesC& clientID,TDesC& serverScript);
- void SendFileToSocketL(const TDesC& aFilename);
- TInt ReadFileSizeL(const TDesC& aFilename);
- void CreateHTTPHeaderEnd(TDes8& aRequest);
- TBool CheckSupportedRates(const TDesC8& aSupportedRates, const TUint8 aRate);
- void Shutdown();
- void DoCmdDownloadSendHTTPGet(const TTEFSectionName& aSection, const TInt aAsyncErrorIndex );
- void DoCmdRecvOneOrMore(const TTEFSectionName& aSection);
- void Close();
- TReal ThroughputInMegaBits( TTimeIntervalMicroSeconds aDuration, TInt aTotalTransferred );
- void RecvOneOrMore(TRequestStatus& status);
-
-private:
- /**
- * Wrapped object
- */
- RSocket* iSocket;
- /**
- * Used in the command DoCmdDownloadSendHTTPGet for RSocket::Write
- */
- CActiveCallback* iActiveCallback;
- /**
- * Used in the command DoCmdConnect for RSocket::Connect
- */
- CActiveCallback* iActCallConnectSocket;
- /**
- * Used in the command DoCmdConnectSocket for RSocket::Connect
- */
- CActiveCallback* iActCallShutDownSocket;
- /**
- * Flag to review if the Socket is Open with RSocket::Connect
- */
- TBool iSocketOpened;
- /**
- * flag to review if the Socket was shutdown
- */
- TBool iSocketStarted;
- /**
- * Async data
- */
- TInt iAsyncErrorIndex;
- /**
- * Buffer for Download in DoCmdReceiveHTTPResponse command
- */
- HBufC8* iDownloadBuffer;
- /**
- * Buffer for Upload in SendFileToSocket
- */
- HBufC8* iUploadBuffer;
- /**
- * Header for response HTPP
- */
- RBuf8 iHttpResponseHeader;
- /**
- * Download throughput
- */
- TReal iDownloadThroughput;
- /**
- * Handle for Filse server session
- */
- RFs iFs;
- /**
- * Upload throughput
- */
- TReal iUploadThroughput;
- /**
- * Bytes received in DoCmdHttpGet
- */
- TInt itotalReceived;
- };
-
-#endif /*T_RSOCKETDATA_H_*/
--- a/wlanapitest/wlanhaitest/wlan/inc/T_RSocketServData.h Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-#ifndef T_RSOCKETSERVDATA_H_
-#define T_RSOCKETSERVDATA_H_
-
-//User Includes
-#include "datawrapperbase.h"
-
-//Epoc includes
-#include <es_sock.h> // RSocketServ, RConnection
-
-class CT_RSocketServData: public CDataWrapperBase
- {
-public:
- static CT_RSocketServData* NewL();
- virtual ~CT_RSocketServData();
-
-public:
- virtual TAny* GetObject();
- virtual TBool DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
- void SetIapID(TUint32 );
- TUint32 GetIapID(){return iIapID;}
-
-protected:
- CT_RSocketServData();
- void ConstructL();
-
-private:
- void DoCmdSetOutgoingIap(const TTEFSectionName& aSection);
- void DoCmdConnect();
- void DoCmdClose();
- void Close();
-
-private:
- /**
- * Wrapped object
- */
- RSocketServ* iSocketServ;
- /**
- * Flag to review RSocketServ is in Connected state
- */
- TBool iSocketServConnected;
- /**
- * Store de ID of the IAP
- */
- TUint32 iIapID;
-
- };
-#endif /*T_RSOCKETSERVDATA_H_*/
--- a/wlanapitest/wlanhaitest/wlan/inc/T_WlanDriverServer.h Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-#ifndef T_WLAN_DRIVER_SERVER_H
-#define T_WLAN_DRIVER_SERVER_H
-
-//Epoc includes
-#include <testserver2.h>
-
-/**
- * This wrapper class extends the test server and creates test server for Wlan driver
- */
-class CT_WlanDriverServer : public CTestServer2
- {
-private:
- class CT_WlanDriverBlock : public CTestBlockController
- {
- public:
- inline CT_WlanDriverBlock();
- inline ~CT_WlanDriverBlock();
-
- CDataWrapper* CreateDataL( const TDesC& aData );
- };
-
-public:
- static CT_WlanDriverServer* NewL();
- inline CTestBlockController* CreateTestBlock();
- };
-
-#include "t_wlandriverserver.inl"
-
-#endif // T_WLAN_DRIVER_SERVER_H
--- a/wlanapitest/wlanhaitest/wlan/inc/T_WlanDriverServer.inl Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-CT_WlanDriverServer::CT_WlanDriverBlock::CT_WlanDriverBlock()
-: CTestBlockController()
- {
- }
-
-CT_WlanDriverServer::CT_WlanDriverBlock::~CT_WlanDriverBlock()
- {
- }
-
-CTestBlockController* CT_WlanDriverServer::CreateTestBlock()
- {
- return new CT_WlanDriverBlock();
- }
--- a/wlanapitest/wlanhaitest/wlan/inc/T_WlanMgmtClientData.h Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-#ifndef T_WLANMGMTCLIENTDATA_H_
-#define T_WLANMGMTCLIENTDATA_H_
-
-//User Includes
-#include "datawrapperbase.h"
-
-//forward
-class CWlanMgmtClient;
-
-class CT_WlanMgmtClientData: public CDataWrapperBase
- {
-public:
- static CT_WlanMgmtClientData* NewL();
- ~CT_WlanMgmtClientData();
-
-public:
- virtual TAny* GetObject();
- virtual TBool DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
-
-protected:
- CT_WlanMgmtClientData();
- void ConstructL();
-
-private:
- void DoCmdNewL();
- void DoCmdGetScanResults(const TTEFSectionName& aSection);
- void DoCmdDestructor();
- void DestroyData();
-
-private:
- /**
- * Wrapped object
- */
- CWlanMgmtClient* iData;
-
-};
-
-
-#endif /*T_WLANMGMTCLIENTDATA_H_*/
--- a/wlanapitest/wlanhaitest/wlan/inc/T_WlanScanInfoData.h Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-
-#ifndef T_WLANSCANINFODATA_H_
-#define T_WLANSCANINFODATA_H_
-
-//User Includes
-#include "datawrapperbase.h"
-
-//forward class
-class CWlanScanInfo;
-
-class CT_WlanScanInfoData: public CDataWrapperBase
- {
-public:
- static CT_WlanScanInfoData* NewL();
- ~CT_WlanScanInfoData();
-
-public:
- virtual TAny* GetObject();
- virtual TBool DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex);
-
-protected:
- CT_WlanScanInfoData();
- void ConstructL();
-
-private:
- void DoCmdNewL(const TTEFSectionName& aSection);
- void DoCmdDestructor();
- void DestroyData();
- void DoCmdInformationElement(const TTEFSectionName& aSection);
-
-private:
- /**
- * Wrapped object
- */
- CWlanScanInfo* iData;
- /**
- * For storing ECom instance UID (needed when destroying the instance)
- */
- TUid iScanInfoInstanceIdentifier;
- };
-
-#endif /*T_WLANSCANINFODATA_H_*/
-
-
\ No newline at end of file
--- a/wlanapitest/wlanhaitest/wlan/pkg/t_wlan.bat Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-@rem
-@rem Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-@rem All rights reserved.
-@rem This component and the accompanying materials are made available
-@rem under the terms of "Eclipse Public License v1.0"
-@rem which accompanies this distribution, and is available
-@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-@rem
-@rem Initial Contributors:
-@rem Nokia Corporation - initial contribution.
-@rem
-@rem Contributors:
-@rem
-@rem Description:
-@rem
-
-testexecute c:\nt\wlan\networking-wlan-validation-automated-connection.script -tcx c:\nt\wlan\t_wlan.tcs
-testexecute c:\nt\wlan\networking-wlan-validation-automated-instantiate.script -tcx c:\nt\wlan\t_wlan.tcs
-testexecute c:\nt\wlan\networking-wlan-validation-automated-transfer.script -tcx c:\nt\wlan\t_wlan.tcs
\ No newline at end of file
--- a/wlanapitest/wlanhaitest/wlan/scripts/networking-wlan-validation-automated-connection.script Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,357 +0,0 @@
-//
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-//
-//! @file
-//! @SYMTestSuiteName networking-wlan-validation-automated-connection
-//! @SYMScriptTestEnvironment This test script requires a basic ROM.
-//
-// Tests all public elements of the RConnection, RSocket, RSocketServ, CWLanMgmtClient, CWLanScanInfo, CComsDataBase, CComsDbTableView
-// classes as a means of confidence that the APIs work as expected.
-//
-// The purpose is to provide a regression test suite of PublishedAll
-// APIs for: RConnection, RSocket, RSocketServ, CWLanMgmtClient, CWLanScanInfo, CComsDataBase, CComsDbTableView
-// The tests are fully automated.
-//
-
-
-
-LOAD_SUITE T_Wlan
-
-
-
-
-
-START_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-CONNECTION-0001
-
-//!@SYMTestCaseID NETWORKING-WLAN-VALIDATION-AUTOMATED-CONNECTION-0001
-//!@SYMAPI
-//! CWlanMgmtClient::NewL();
-//! REComSession::CreateImplementationL(TUid, TUid{ref});
-//! MWlanMgmtInterface::GetScanResults(CWlanScanInfo{ref});
-//! MWlanScanInfoBase::InformationElement( TUint8, TUint8{ref}, const TUint8{ptr}{ptr} ) ;
-//! REComSession::DestroyedImplementation(TUid);
-//!@SYMAuthor alavariega
-//!@SYMCreationDate 23/06/2008
-//!@SYMTestCaseDesc Wlan scan
-//!@SYMTestActions
-//! 1.- Instantiate management client. Scan for broadcasted Wireless network names; SSIDs: NewL
-//! 2.- Instantiate Scan Info. Check that the given SSIDs were found:NewL ( WlanScanUid = {UID, Uid} )
-//! 3.- GetScanResults ( scaninfo = wlansinf )
-//! 4.- SelectScanInfo ( DEFAULT_SSID_Ssid = {IAP,Iap} )
-//! 5.- Destroy Scan information: ~
-//! 6.- Destroy management client: ~
-//!@SYMTestStatus Verified
-//!@SYMTestPriority Normal
-//!@SYMTestExpectedResults
-//! TEF reports the test case passed.
-//!@SYMTestType CIT
-
- START_TEST_BLOCK 100 T_Wlan \nt\wlan\networking-wlan-validation-automated-connection.ini
- CREATE_OBJECT WlanMgmtClient wmgmtcnt
- CREATE_OBJECT WlanScanInfo wlansinf
- COMMAND wmgmtcnt NewL
- COMMAND wlansinf NewL NETWORKING-Wlan-Connection-0001-0001-NewL_command02
- COMMAND wmgmtcnt GetScanResults NETWORKING-Wlan-Connection-0001-0001-GetScanResults_command03
- COMMAND wlansinf InformationElement NETWORKING-Wlan-Connection-0001-0001-InformationElement_command04
- COMMAND wlansinf ~
- COMMAND wmgmtcnt ~
- END_TEST_BLOCK
-END_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-CONNECTION-0001
-
-
-
-
-START_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-CONNECTION-0002
-
-//!@SYMTestCaseID NETWORKING-WLAN-VALIDATION-AUTOMATED-CONNECTION-0002
-//!@SYMAPI
-//! CCommsDatabase::NewL(TBool);
-//! CCommsDbTableView::OpenIAPTableViewMatchingBearerSetLC(TUint32, TCommDbConnectionDirection);
-//! CWlanMgmtClient::NewL();
-//! MWlanMgmtInterface::GetScanResults(CWlanScanInfo{ref});
-//! MWlanScanInfoBase::InformationElement( TUint8, TUint8{ref}, const TUint8{ptr}{ptr} ) ;
-//! CCommsDbTableView::GotoFirstRecord();
-//! CCommsDbTableView::ReadTextL(const TDesC{ref}, TDes16{ref});
-//! CCommsDbTableView::ReadUintL(const TDesC{ref}, TUint32{ref});
-//! CWLanSettings::GetWlanSettings(TUint32,SWLANSettings{ref});
-//! CWLanSettings::WriteWlanSettings(SWLANSettings{ref});
-//! CWLanSettings::Disconnect();
-//! CCommsDbTableView::GotoNextRecord();
-//! RSocketServ::Connect(TUint);
-//! RSocket::Open(RSocketServ{ref}, TUint);
-//! RConnection::Start(TConnPref{ref});
-//! RConnection::Open(RSocketServ{ref},TUint,TUint,TUint, RConnection{ref});
-//! RSocket::Connect(TSockAddr{ref},TRequestStatus{ref});
-//! RSocket::RecvOneOrMore(TDes8{ref},TUint,TRequestStatus{ref},TSockXfrLength{ref});
-//! Shutdown(TShutdown,TRequestStatus{ref});
-//!@SYMAuthor alavariega
-//!@SYMCreationDate 23/06/2008
-//!@SYMTestCaseDesc Wlan connect
-//!@SYMTestActions
-//! 1.- Instantiate a CCOMMSDB : NewL
-//! 2.- instantiate a CCOMMSDBTABLEVIEW: NewL ( commsdb = comsdb )
-//! 3.- SetOutgoingIap ( WLANIAP = {IAP,Iap}; DEFAULT_SSID = {IAP,Ssid}; commsdbtableview = comsdbtblview )
-//! 4.- Destroy a CCOMMSDBTABLEVIEW object: ~
-//! 5.- Destroy a CCOMMSDB object: ~
-//! 6.- ConnectSocketServ
-//! 7.- OpenRConnection ( socketserv = scktserv )
-//! 8.- StartRConnection ( socketserv = scktserv )
-//! 9.- OpenSocket ( socketserv = scktserv; connection = rcntion )
-//! 10.- ConnectSocket ( Ip = {DownloadServer,Ip}; Port = {DownloadServer,Port} )
-//! 11.- HttpGet
-//! 12.- ShutDownSocket
-//! 13.- CloseSocket
-//! 14.- CloseConnection
-//! 15.- CloseSocketServ
-//!
-
-//!@SYMTestStatus Verified
-//!@SYMTestPriority Normal
-//!@SYMTestExpectedResults
-//! Connect to a WLAN with no errors
-//!@SYMTestType CIT
-
- START_TEST_BLOCK 600 T_Wlan \nt\wlan\networking-wlan-validation-automated-connection.ini
- CREATE_OBJECT CCommsDatabase comsdb
- CREATE_OBJECT CCommsDbTableView comsdbtblview
- CREATE_OBJECT RSocketServ scktserv
- CREATE_OBJECT RConnection rcntion
- CREATE_OBJECT RSocket rsckt
- COMMAND comsdb NewL
- COMMAND comsdbtblview NewL NETWORKING-Wlan-Connection-0002-0001-NewL_command02
- COMMAND scktserv SetOutgoingIap NETWORKING-Wlan-Connection-0002-0001-SetOutgoingIap_command03
- COMMAND comsdbtblview ~
- COMMAND comsdb ~
- COMMAND scktserv Connect
- COMMAND rcntion Open NETWORKING-Wlan-Connection-0002-0001-Open_command07
- COMMAND rcntion Start NETWORKING-Wlan-Connection-0002-0001-Start_command08
- COMMAND rsckt Open NETWORKING-Wlan-Connection-0002-0001-Open_command09
- COMMAND rsckt Connect NETWORKING-Wlan-Connection-0002-0001-Connect_command10
- OUTSTANDING
- COMMAND rsckt HttpGet
- COMMAND rsckt Shutdown
- OUTSTANDING
- COMMAND rsckt Close
- COMMAND rcntion Close
- COMMAND scktserv Close
- END_TEST_BLOCK
-END_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-CONNECTION-0002
-
-
-
-
-START_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-CONNECTION-0003
-
-//!@SYMTestCaseID NETWORKING-WLAN-VALIDATION-AUTOMATED-CONNECTION-0003
-//!@SYMAPI
-//! CCommsDatabase::NewL(TBool);
-//! CCommsDbTableView::OpenIAPTableViewMatchingBearerSetLC(TUint32, TCommDbConnectionDirection);
-//! CWlanMgmtClient::NewL();
-//! REComSession::CreateImplementationL(TUid, TUid{ref});
-//! MWlanMgmtInterface::GetScanResults(CWlanScanInfo{ref});
-//! MWlanScanInfoBase::InformationElement( TUint8, TUint8{ref}, const TUint8{ptr}{ptr} ) ;
-//! CCommsDbTableView::GotoFirstRecord();
-//! CCommsDbTableView::ReadTextL(const TDesC{ref}, TDes16{ref});
-//! CCommsDbTableView::ReadUintL(const TDesC{ref}, TUint32{ref});
-//! CWLanSettings::GetWlanSettings(TUint32,SWLANSettings{ref});
-//! CWLanSettings::WriteWlanSettings(SWLANSettings{ref});
-//! CWLanSettings::Disconnect();
-//! CCommsDbTableView::GotoNextRecord();
-//! RSocketServ::Connect(TUint);
-//! RConnection::Open(RSocketServ{ref}, TUint);
-//! RConnection::Start(TConnPref{ref});
-//! REComSession::DestroyedImplementation(TUid);
-//! RSocket::Open(RSocketServ{ref},TUint,TUint,TUint, RConnection{ref});
-//! RSocket::Connect(TSockAddr{ref},TRequestStatus{ref});
-//! RSocket::RecvOneOrMore(TDes8{ref},TUint,TRequestStatus{ref},TSockXfrLength{ref});
-//! RSocket::Shutdown(TShutdown,TRequestStatus{ref});
-//!
-//!@SYMAuthor alavariega
-//!@SYMCreationDate 23/06/2008
-//!@SYMTestCaseDesc Wlan Connection to 802.11b Router
-//!@SYMTestActions
-//! 1.- InstantiateMgmtClient: NewL
-//! 2.- InstantiateScanInfo: NewL ( WlanScanUid = {UID, Uid} )
-//! 3.- Instantiate a CCOMMSDB: NewL
-//! 4.- Instantiate a CCOMMSDBTABLEVIEW: NewL ( commsdb = comsdb )
-//! 5.- GetScanResultsL ( scaninfo = wlansinf )
-//! 6.- SelectScanInfo ( DEFAULT_SSID_Ssid = {IAP80211b,Iap} )
-//! 7.- CheckSupportedRates ( rate = 2; scaninfo = wlansinf )
-//! 8.- CheckSupportedRates ( rate = 4; scaninfo = wlansinf )
-//! 9.- CheckSupportedRates ( rate = 11; scaninfo = wlansinf )
-//! 10.- CheckSupportedRates ( rate = 22; scaninfo = wlansinf )
-//! 11.- SetOutgoingIap ( WLANIAP = {IAP,Iap};DEFAULT_SSID = {IAP80211b,Iap}; commsdbtableview = comsdbtblview )
-//! 12.- Destroy a CCOMMSDBTABLEVIEW object: ~
-//! 13.- Destroy a CCOMMSDB object: ~
-//! 14.- ConnectSocketServ
-//! 15.- OpenRConnection ( socketserv = scktserv )
-//! 16.- StartRConnection ( socketserv = scktserv )
-//! 17.- OpenSocket ( socketserv = scktserv;connection = rcntion )
-//! 18.- ConnectSocket ( Ip = {DownloadServer,Ip}; Port = {DownloadServer,Port} )
-//! 19.- HttpGet
-//! 20.- ShutDownSocket
-//! 21.- CloseSocket
-//! 22.- CloseConnection
-//! 23.- CloseSocketServ
-//! 24.- DestroyScanInfo: ~
-//! 25.- DestroyMgmtClient: ~
-//!@SYMTestStatus Verified
-//!@SYMTestPriority Normal
-//!@SYMTestExpectedResults
-//! Test case passes if the DUT can connect to the WLAN 802.11b router broadcasting the defined SSID.
-//!@SYMTestType CIT
-
- START_TEST_BLOCK 600 T_Wlan \nt\wlan\networking-wlan-validation-automated-connection.ini
- CREATE_OBJECT WlanMgmtClient wmgmtcnt
- CREATE_OBJECT WlanScanInfo wlansinf
- CREATE_OBJECT CCommsDatabase comsdb
- CREATE_OBJECT CCommsDbTableView comsdbtblview
- CREATE_OBJECT RSocketServ scktserv
- CREATE_OBJECT RConnection rcntion
- CREATE_OBJECT RSocket rsckt
- COMMAND wmgmtcnt NewL
- COMMAND wlansinf NewL NETWORKING-Wlan-Connection-0003-0001-NewL_command02
- COMMAND comsdb NewL
- COMMAND comsdbtblview NewL NETWORKING-Wlan-Connection-0003-0001-NewL_command04
- COMMAND wmgmtcnt GetScanResults NETWORKING-Wlan-Connection-0003-0001-GetScanResults_command05
- COMMAND wlansinf InformationElement NETWORKING-Wlan-Connection-0003-0001-InformationElement_command06
- COMMAND rsckt CheckSupportedRates NETWORKING-Wlan-Connection-0003-0001-CheckSupportedRates_command07
- COMMAND rsckt CheckSupportedRates NETWORKING-Wlan-Connection-0003-0001-CheckSupportedRates_command08
- COMMAND rsckt CheckSupportedRates NETWORKING-Wlan-Connection-0003-0001-CheckSupportedRates_command09
- COMMAND rsckt CheckSupportedRates NETWORKING-Wlan-Connection-0003-0001-CheckSupportedRates_command10
- COMMAND scktserv SetOutgoingIap NETWORKING-Wlan-Connection-0003-0001-SetOutgoingIap_command12
- COMMAND comsdbtblview ~
- COMMAND comsdb ~
- COMMAND scktserv Connect
- COMMAND rcntion Open NETWORKING-Wlan-Connection-0003-0001-Open_command16
- COMMAND rcntion Start NETWORKING-Wlan-Connection-0003-0001-Start_command17
- COMMAND rsckt Open NETWORKING-Wlan-Connection-0003-0001-Open_command18
- COMMAND rsckt Connect NETWORKING-Wlan-Connection-0003-0001-Connect_command19
- OUTSTANDING
- COMMAND rsckt HttpGet
- COMMAND rsckt Shutdown
- OUTSTANDING
- COMMAND rsckt Close
- COMMAND rcntion Close
- COMMAND scktserv Close
- COMMAND wlansinf ~
- COMMAND wmgmtcnt ~
- END_TEST_BLOCK
-END_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-CONNECTION-0003
-
-
-
-
-START_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-CONNECTION-0004
-
-//!@SYMTestCaseID NETWORKING-WLAN-VALIDATION-AUTOMATED-CONNECTION-0004
-//!@SYMAPI
-//! CCommsDatabase::NewL(TBool);
-//! CCommsDbTableView::OpenIAPTableViewMatchingBearerSetLC(TUint32, TCommDbConnectionDirection);
-//! CWlanMgmtClient::NewL();
-//! REComSession::CreateImplementationL(TUid, TUid{ref});
-//! MWlanMgmtInterface::GetScanResults(CWlanScanInfo{ref});
-//! MWlanScanInfoBase::InformationElement( TUint8, TUint8{ref}, const TUint8{ptr}{ptr} ) ;
-//! CCommsDbTableView::GotoFirstRecord();
-//! CCommsDbTableView::ReadTextL(const TDesC{ref}, TDes16{ref});
-//! CCommsDbTableView::ReadUintL(const TDesC{ref}, TUint32{ref});
-//! CWLanSettings::GetWlanSettings(TUint32,SWLANSettings{ref});
-//! CWLanSettings::WriteWlanSettings(SWLANSettings{ref});
-//! CWLanSettings::Disconnect();
-//! CCommsDbTableView::GotoNextRecord();
-//! RSocketServ::Connect(TUint);
-//! RConnection::Open(RSocketServ{ref}, TUint);
-//! RConnection::Start(TConnPref{ref});
-//! REComSession::DestroyedImplementation(TUid);
-//! RSocket::Open(RSocketServ{ref},TUint,TUint,TUint, RConnection{ref});
-//! RSocket::Connect(TSockAddr{ref},TRequestStatus{ref});
-//! RSocket::RecvOneOrMore(TDes8{ref},TUint,TRequestStatus{ref},TSockXfrLength{ref});
-//! RSocket::Shutdown(TShutdown,TRequestStatus{ref});
-//!
-//!@SYMAuthor alavariega
-//!@SYMCreationDate 23/06/2008
-//!@SYMTestCaseDesc Wlan Connection to 802.11g Router
-//!@SYMTestActions
-//! 1.- InstantiateMgmtClient: NewL
-//! 2.- InstantiateScanInfo: NewL ( WlanScanUid = {UID, Uid} )
-//! 3.- Instantiate a CCOMMSDB: NewL
-//! 4.- Instantiate a CCOMMSDBTABLEVIEW: NewL ( commsdb = comsdb)
-//! 5.- GetScanResultsL ( scaninfo = wlansinf )
-//! 6.- SelectScanInfo ( DEFAULT_SSID_Ssid = {IAP80211g,Iap} )
-//! 7.- CheckSupportedRates ( rate = 2;scaninfo = wlansinf )
-//! 8.- CheckSupportedRates ( rate = 4;scaninfo = wlansinf )
-//! 9.- CheckSupportedRates ( rate = 11;scaninfo = wlansinf )
-//! 10.- CheckSupportedRates ( rate = 22;scaninfo = wlansinf )
-//! 11.- SetOutgoingIap ( WLANIAP = {IAP,Iap}; DEFAULT_SSID = {IAP80211g,Iap}; commsdbtableview = comsdbtblview )
-//! 12.- Destroy a CCOMMSDBTABLEVIEW object: ~
-//! 13.- Destroy a CCOMMSDB object: ~
-//! 14.- ConnectSocketServ
-//! 15.- OpenRConnection ( socketserv = scktserv )
-//! 16.- StartRConnection ( socketserv = scktserv )
-//! 17.- OpenSocket ( socketserv = scktserv; connection = rcntion)
-//! 18.- ConnectSocket ( Ip = {DownloadServer,Ip}; Port ={DownloadServer,Port} )
-//! 19.- HttpGet
-//! 20.- ShutDownSocket
-//! 21.- CloseSocket
-//! 22.- CloseConnection
-//! 23.- CloseSocketServ
-//! 24.- DestroyScanInfo: ~
-//! 25.- DestroyMgmtClient: ~
-//!@SYMTestStatus Verified
-//!@SYMTestPriority Normal
-//!@SYMTestExpectedResults
-//! Test case passes if the DUT can connect to the WLAN 802.11g router broadcasting the defined SSID.
-//!@SYMTestType CIT
-
- START_TEST_BLOCK 600 T_Wlan \nt\wlan\networking-wlan-validation-automated-connection.ini
- CREATE_OBJECT WlanMgmtClient wmgmtcnt
- CREATE_OBJECT WlanScanInfo wlansinf
- CREATE_OBJECT CCommsDatabase comsdb
- CREATE_OBJECT CCommsDbTableView comsdbtblview
- CREATE_OBJECT RSocketServ scktserv
- CREATE_OBJECT RConnection rcntion
- CREATE_OBJECT RSocket rsckt
- COMMAND wmgmtcnt NewL
- COMMAND wlansinf NewL NETWORKING-Wlan-Connection-0004-0001-NewL_command02
- COMMAND comsdb NewL
- COMMAND comsdbtblview NewL NETWORKING-Wlan-Connection-0004-0001-NewL_command04
- COMMAND wmgmtcnt GetScanResults NETWORKING-Wlan-Connection-0004-0001-GetScanResults_command05
- COMMAND wlansinf InformationElement NETWORKING-Wlan-Connection-0004-0001-InformationElement_command06
- COMMAND rsckt CheckSupportedRates NETWORKING-Wlan-Connection-0004-0001-CheckSupportedRates_command07
- COMMAND rsckt CheckSupportedRates NETWORKING-Wlan-Connection-0004-0001-CheckSupportedRates_command08
- COMMAND rsckt CheckSupportedRates NETWORKING-Wlan-Connection-0004-0001-CheckSupportedRates_command09
- COMMAND rsckt CheckSupportedRates NETWORKING-Wlan-Connection-0004-0001-CheckSupportedRates_command10
- COMMAND scktserv SetOutgoingIap NETWORKING-Wlan-Connection-0004-0001-SetOutgoingIap_command12
- COMMAND comsdbtblview ~
- COMMAND comsdb ~
- COMMAND scktserv Connect
- COMMAND rcntion Open NETWORKING-Wlan-Connection-0004-0001-Open_command16
- COMMAND rcntion Start NETWORKING-Wlan-Connection-0004-0001-Start_command17
- COMMAND rsckt Open NETWORKING-Wlan-Connection-0004-0001-Open_command18
- COMMAND rsckt Connect NETWORKING-Wlan-Connection-0004-0001-Connect_command19
- OUTSTANDING
- COMMAND rsckt HttpGet
- COMMAND rsckt Shutdown
- OUTSTANDING
- COMMAND rsckt Close
- COMMAND rcntion Close
- COMMAND scktserv Close
- COMMAND wlansinf ~
- COMMAND wmgmtcnt ~
- END_TEST_BLOCK
-END_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-CONNECTION-0004
-
-DELAY 10000
--- a/wlanapitest/wlanhaitest/wlan/scripts/networking-wlan-validation-automated-instantiate.script Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-//
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-//
-//! @file
-//! @SYMTestSuiteName networking-wlan-validation-automated-instantiate
-//! @SYMScriptTestEnvironment This test script requires a basic ROM.
-//
-// Tests all public elements of the RConnection, RSocket, RSocketServ, CWLanMgmtClient, CWLanScanInfo, CComsDataBase, CComsDbTableView
-// classes as a means of confidence that the APIs work as expected.
-//
-// The purpose is to provide a regression test suite of PublishedAll
-// APIs for: RConnection, RSocket, RSocketServ, CWLanMgmtClient, CWLanScanInfo, CComsDataBase, CComsDbTableView
-// The tests are fully automated.
-//
-
-
-
-LOAD_SUITE T_Wlan
-
-
-
-
-
-START_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-INSTANTIATE-0001
-
-//!@SYMTestCaseID NETWORKING-WLAN-VALIDATION-AUTOMATED-INSTANTIATE-0001
-//!@SYMAPI
-//! REComSession::CreateImplementationL(TUid, TUid{ref});
-//! REComSession::DestroyedImplementation(TUid);
-//!@SYMAuthor alavariega
-//!@SYMCreationDate 23/06/2008
-//!@SYMTestCaseDesc Instantiate ScanInfo
-//!@SYMTestActions
-//! 1.- Instantiate WLAN Scan Info: NewL ( WlanScanUid = {UID, Uid} )
-//! 2.- Destroy Scan Info: ~
-//!@SYMTestStatus Verified
-//!@SYMTestPriority Normal
-//!@SYMTestExpectedResults
-//! Instantiate WLAN Scan Info with no errors
-//!@SYMTestType CIT
-
- START_TEST_BLOCK 100 T_Wlan \nt\wlan\networking-wlan-validation-automated-instantiate.ini
- CREATE_OBJECT WlanScanInfo wlansinf
- COMMAND wlansinf NewL NETWORKING-Wlan-Instantiate-0001-0001-NewL_command01
- COMMAND wlansinf ~
- END_TEST_BLOCK
-END_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-INSTANTIATE-0001
-
-
-
-
-START_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-INSTANTIATE-0002
-
-//!@SYMTestCaseID NETWORKING-WLAN-VALIDATION-AUTOMATED-INSTANTIATE-0002
-//!@SYMAPI
-//! CWlanMgmtClient::NewL();
-//!
-//!@SYMAuthor alavariega
-//!@SYMCreationDate 23/06/2008
-//!@SYMTestCaseDesc Instantiate WlanMgmtClient
-//!@SYMTestActions
-//! 1.- Instantiate WLAN Mgmt Client: NewL
-//! 2.- Destroy Mgmt Client: ~
-//!@SYMTestStatus Verified
-//!@SYMTestPriority Normal
-//!@SYMTestExpectedResults
-//! Instantiate WLAN Management Client with no errors
-//!@SYMTestType CIT
-
- START_TEST_BLOCK 100 T_Wlan \nt\wlan\networking-wlan-validation-automated-instantiate.ini
- CREATE_OBJECT WlanMgmtClient wmgmtcnt
- COMMAND wmgmtcnt NewL
- COMMAND wmgmtcnt ~
- END_TEST_BLOCK
-END_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-INSTANTIATE-0002
-
-DELAY 10000
--- a/wlanapitest/wlanhaitest/wlan/scripts/networking-wlan-validation-automated-transfer.script Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,361 +0,0 @@
-//
-// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-//
-//! @file
-//! @SYMTestSuiteName networking-wlan-validation-automated-transfer
-//! @SYMScriptTestEnvironment This test script requires a basic ROM.
-//
-// Tests all public elements of the RConnection, RSocket, RSocketServ, CWLanMgmtClient, CWLanScanInfo, CComsDataBase, CComsDbTableView
-// classes as a means of confidence that the APIs work as expected.
-//
-// The purpose is to provide a regression test suite of PublishedAll
-// APIs for: RConnection, RSocket, RSocketServ, CWLanMgmtClient, CWLanScanInfo, CComsDataBase, CComsDbTableView
-// The tests are fully automated.
-//
-
-
-
-LOAD_SUITE T_Wlan
-
-
-
-
-
-START_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-TRANSFER-0001
-
-//!@SYMTestCaseID NETWORKING-WLAN-VALIDATION-AUTOMATED-TRANSFER-0001
-//!@SYMAPI
-//! CCommsDatabase::NewL(TBool);
-//! CCommsDbTableView::OpenIAPTableViewMatchingBearerSetLC(TUint32, TCommDbConnectionDirection);
-//! CWlanMgmtClient::NewL()
-//! MWlanMgmtInterface::GetScanResults(CWlanScanInfo{ref});
-//! MWlanScanInfoBase::InformationElement( TUint8, TUint8{ref}, const TUint8{ptr}{ptr}) ;
-//! CCommsDbTableView::GotoFirstRecord();
-//! CCommsDbTableView::ReadTextL(const TDesC{ref}, TDes16{ref});
-//! CCommsDbTableView::ReadUintL(const TDesC{ref}, TUint32{ref});
-//! CWLanSettings::GetWlanSettings(TUint32,SWLANSettings{ref});
-//! CWLanSettings::WriteWlanSettings(SWLANSettings{ref});
-//! CWLanSettings::Disconnect();
-//! CCommsDbTableView::GotoNextRecord();
-//! RSocketServ::Connect(TUint);
-//! RConnection::Open(RSocketServ{ref}, TUint);
-//! RConnection::Start(TConnPref{ref});
-//! RSocket::Open(RSocketServ{ref},TUint,TUint,TUint, RConnection{ref});
-//! RSocket::Connect(TSockAddr{ref},TRequestStatus{ref});
-//! RSocket::RecvOneOrMore(TDes8{ref},TUint,TRequestStatus{ref},TSockXfrLength{ref});
-//! RSocket::Shutdown(TShutdown,TRequestStatus{ref});
-//!
-//!@SYMAuthor alavariega
-//!@SYMCreationDate 23/06/2008
-//!@SYMTestCaseDesc Wlan Download 100kB to User Disk
-//!@SYMTestActions
-//! 1.- Instantiate a CCOMMSDB: NewL
-//! 2.- Instantiate a CCOMMSDBTABLEVIEW: NewL ( commsdb = comsdb )
-//! 3.- SetOutgoingIap ( WLANIAP = {IAP,Iap}; DEFAULT_SSID = {IAP,Ssid} ; commsdbtableview = comsdbtblview )
-//! 4.- Destroy a CCOMMSDBTABLEVIEW object: ~
-//! 5.- Destroy a CCOMMSDB object: ~
-//! 6.- ConnectSocketServ
-//! 7.- OpenRConnection socketserv ( socketserv = scktserv )
-//! 8.- StartRConnection socketserv ( socketserv = scktserv )
-//! 9.- OpenSocket( socketserv = scktserv; connection = rcntion )
-//! 10.- ConnectSocket ( Ip = {DownloadServer,Ip}; Port = {DownloadServer,Port} )
-//! 11.- DownloadSendHTTPGet ( Host = {DownloadServer,Ip}; File = /nokia/0100k.bin )
-//! 12.- ReceiveHTTPResponse( Save = {driveC,mmc}\0100k.bin )
-//! 13.- ShutDownSocket
-//! 14.- CloseSocket
-//! 15.- CloseConnection
-//! 16.- CloseSocketServ
-//!@SYMTestStatus Verified
-//!@SYMTestPriority Normal
-//!@SYMTestExpectedResults
-//! TEF reports the test case passed.
-//!@SYMTestType CIT
-
- START_TEST_BLOCK 600 T_Wlan \nt\wlan\networking-wlan-validation-automated-transfer.ini
- CREATE_OBJECT CCommsDatabase comsdb
- CREATE_OBJECT CCommsDbTableView comsdbtblview
- CREATE_OBJECT RSocketServ scktserv
- CREATE_OBJECT RConnection rcntion
- CREATE_OBJECT RSocket rsckt
- COMMAND comsdb NewL
- COMMAND comsdbtblview NewL NETWORKING-Wlan-Transfer-0001-0001-NewL_command02
- COMMAND scktserv SetOutgoingIap NETWORKING-Wlan-Transfer-0001-0001-SetOutgoingIap_command03
- COMMAND comsdbtblview ~
- COMMAND comsdb ~
- COMMAND scktserv Connect
- COMMAND rcntion Open NETWORKING-Wlan-Transfer-0001-0001-Open_command07
- COMMAND rcntion Start NETWORKING-Wlan-Transfer-0001-0001-Start_command08
- COMMAND rsckt Open NETWORKING-Wlan-Transfer-0001-0001-Open_command09
- COMMAND rsckt Connect NETWORKING-Wlan-Transfer-0001-0001-Connect_command10
- OUTSTANDING
- COMMAND rsckt DownloadSendHTTPGet NETWORKING-Wlan-Transfer-0001-0001-DownloadSendHTTPGet_command11
- OUTSTANDING
- COMMAND rsckt RecvOneOrMore NETWORKING-Wlan-Transfer-0001-0001-RecvOneOrMore_command12
- COMMAND rsckt Shutdown
- OUTSTANDING
- COMMAND rsckt Close
- COMMAND rcntion Close
- COMMAND scktserv Close
- END_TEST_BLOCK
-END_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-TRANSFER-0001
-
-
-
-
-START_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-TRANSFER-0002
-
-//!@SYMTestCaseID NETWORKING-WLAN-VALIDATION-AUTOMATED-TRANSFER-0002
-//!@SYMAPI
-//! CCommsDatabase::NewL(TBool);
-//! CCommsDbTableView::OpenIAPTableViewMatchingBearerSetLC(TUint32, TCommDbConnectionDirection);
-//! CWlanMgmtClient::NewL()
-//! MWlanMgmtInterface::GetScanResults(CWlanScanInfo{ref});
-//! MWlanScanInfoBase::InformationElement(TUint8, TUint8{ref}, const TUint8{ptr}{ptr}) ;
-//! CCommsDbTableView::GotoFirstRecord();
-//! CCommsDbTableView::ReadTextL(const TDesC{ref}, TDes16{ref});
-//! CCommsDbTableView::ReadUintL(const TDesC{ref}, TUint32{ref});
-//! CWLanSettings::GetWlanSettings(TUint32,SWLANSettings{ref});
-//! CWLanSettings::WriteWlanSettings(SWLANSettings{ref});
-//! CWLanSettings::Disconnect();
-//! CCommsDbTableView::GotoNextRecord();
-//! RSocketServ::Connect(TUint);
-//! RConnection::Open(RSocketServ{ref}, TUint);
-//! RConnection::Start(TConnPref{ref});
-//! RSocket::Open(RSocketServ{ref},TUint,TUint,TUint, RConnection{ref});
-//! RSocket::Connect(TSockAddr{ref},TRequestStatus{ref});
-//! RSocket::RecvOneOrMore(TDes8{ref},TUint,TRequestStatus{ref},TSockXfrLength{ref});
-//! RSocket::Shutdown(TShutdown,TRequestStatus{ref});
-//!
-//!@SYMAuthor alavariega
-//!@SYMCreationDate 23/06/2008
-//!@SYMTestCaseDesc Wlan Download 10kB to Memory Card
-//!@SYMTestActions
-//! 1.- Instantiate a CCOMMSDB: NewL
-//! 2.- Instantiate a CCOMMSDBTABLEVIEW: NewL ( commsdb = comsdb )
-//! 3.- SetOutgoingIap ( WLANIAP = {IAP,Iap}; DEFAULT_SSID = {IAP,Ssid}; commsdbtableview = comsdbtblview )
-//! 4.- Destroy a CCOMMSDBTABLEVIEW object: ~
-//! 5.- Destroy a CCOMMSDB object: ~
-//! 6.- ConnectSocketServ
-//! 7.- OpenRConnection ( socketserv = scktserv )
-//! 8.- StartRConnection socketserv ( socketserv = scktserv )
-//! 9.- OpenSocket ( socketserv = scktserv; connection = rcntion )
-//! 10.- ConnectSocket ( Ip = {DownloadServer,Ip}; Port ={DownloadServer,Port} )
-//! 11.- DownloadSendHTTPGet ( Host = {DownloadServer,Ip}; File = /nokia/0010k.bin )
-//! 12.- ReceiveHTTPResponse ( Save = {driveE,mmc}\0010k.bin )
-//! 13.- ShutDownSocket
-//! 14.- CloseSocket
-//! 15.- CloseConnection
-//! 16.- CloseSocketServ
-//!@SYMTestStatus Verified
-//!@SYMTestPriority Normal
-//!@SYMTestExpectedResults
-//! TEF reports the test case passed.
-//!@SYMTestType CIT
-
- START_TEST_BLOCK 600 T_Wlan \nt\wlan\networking-wlan-validation-automated-transfer.ini
- CREATE_OBJECT CCommsDatabase comsdb
- CREATE_OBJECT CCommsDbTableView comsdbtblview
- CREATE_OBJECT RSocketServ scktserv
- CREATE_OBJECT RConnection rcntion
- CREATE_OBJECT RSocket rsckt
- COMMAND comsdb NewL
- COMMAND comsdbtblview NewL NETWORKING-Wlan-Transfer-0002-0001-NewL_command02
- COMMAND scktserv SetOutgoingIap NETWORKING-Wlan-Transfer-0002-0001-SetOutgoingIap_command03
- COMMAND comsdbtblview ~
- COMMAND comsdb ~
- COMMAND scktserv Connect
- COMMAND rcntion Open NETWORKING-Wlan-Transfer-0002-0001-Open_command07
- COMMAND rcntion Start NETWORKING-Wlan-Transfer-0002-0001-Start_command08
- COMMAND rsckt Open NETWORKING-Wlan-Transfer-0002-0001-Open_command09
- COMMAND rsckt Connect NETWORKING-Wlan-Transfer-0002-0001-Connect_command10
- OUTSTANDING
- COMMAND rsckt DownloadSendHTTPGet NETWORKING-Wlan-Transfer-0002-0001-DownloadSendHTTPGet_command11
- OUTSTANDING
- COMMAND rsckt RecvOneOrMore NETWORKING-Wlan-Transfer-0002-0001-RecvOneOrMore_command12
- COMMAND rsckt Shutdown
- OUTSTANDING
- COMMAND rsckt Close
- COMMAND rcntion Close
- COMMAND scktserv Close
- END_TEST_BLOCK
-END_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-TRANSFER-0002
-
-
-
-
-START_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-TRANSFER-0003
-
-//!@SYMTestCaseID NETWORKING-WLAN-VALIDATION-AUTOMATED-TRANSFER-0003
-//!@SYMAPI
-//! CCommsDatabase::NewL(TBool);
-//! CCommsDbTableView::OpenIAPTableViewMatchingBearerSetLC(TUint32, TCommDbConnectionDirection);
-//! CWlanMgmtClient::NewL()
-//! MWlanMgmtInterface::GetScanResults(CWlanScanInfo{ref});
-//! MWlanScanInfoBase::InformationElement(TUint8, TUint8{ref}, const TUint8{ptr}{ptr}) ;
-//! CCommsDbTableView::GotoFirstRecord();
-//! CCommsDbTableView::ReadTextL(const TDesC{ref}, TDes16{ref});
-//! CCommsDbTableView::ReadUintL(const TDesC{ref}, TUint32{ref});
-//! CWLanSettings::GetWlanSettings(TUint32,SWLANSettings{ref});
-//! CWLanSettings::WriteWlanSettings(SWLANSettings{ref});
-//! CWLanSettings::Disconnect();
-//! CCommsDbTableView::GotoNextRecord();
-//! RSocketServ::Connect(TUint);
-//! RConnection::Open(RSocketServ{ref}, TUint);
-//! RConnection::Start(TConnPref{ref});
-//! RSocket::Open(RSocketServ{ref},TUint,TUint,TUint, RConnection{ref});
-//! RSocket::Connect(TSockAddr{ref},TRequestStatus{ref});
-//! RSocket::RecvOneOrMore(TDes8{ref},TUint,TRequestStatus{ref},TSockXfrLength{ref});
-//! RSocket::Shutdown(TShutdown,TRequestStatus{ref});
-//!
-//!@SYMAuthor alavariega
-//!@SYMCreationDate 23/06/2008
-//!@SYMTestCaseDesc Wlan Download 10MB to User Disk
-//!@SYMTestActions
-//! 1.- Instantiate a CCOMMSDB: NewL
-//! 2.- Instantiate a CCOMMSDBTABLEVIEW: NewL ( commsdb = comsdb )
-//! 3.- SetOutgoingIap ( WLANIAP = {IAP,Iap}; DEFAULT_SSID = {IAP,Ssid}; commsdbtableview = comsdbtblview)
-//! 4.- Destroy a CCOMMSDBTABLEVIEW object: ~
-//! 5.- Destroy a CCOMMSDB object: ~
-//! 6.-ConnectSocketServ
-//! 7.-OpenRConnection ( socketserv = scktserv )
-//! 8.- StartRConnection ( socketserv = scktserv )
-//! 9.- OpenSocket socketserv connection( socketserv = scktserv; connection = rcntion )
-//! 10.- ConnectSocket ( Ip = {DownloadServer,Ip}; Port = {DownloadServer,Port} )
-//! 11.- DownloadSendHTTPGet ( Host = {DownloadServer,Ip}; File = /nokia/10MB.bin )
-//! 12.- ReceiveHTTPResponse ( Save = {driveC,mmc}\10MB.bin )
-//! 13.-ShutDownSocket
-//! 14.- CloseSocket
-//! 15.- CloseConnection
-//! 16.- CloseSocketServer
-//!@SYMTestStatus Verified
-//!@SYMTestPriority Normal
-//!@SYMTestExpectedResults
-//! Download a 10MB file to User Disk with no errors
-//!@SYMTestType CIT
-
- START_TEST_BLOCK 6000000 T_Wlan \nt\wlan\networking-wlan-validation-automated-transfer.ini
- CREATE_OBJECT CCommsDatabase comsdb
- CREATE_OBJECT CCommsDbTableView comsdbtblview
- CREATE_OBJECT RSocketServ scktserv
- CREATE_OBJECT RConnection rcntion
- CREATE_OBJECT RSocket rsckt
- COMMAND comsdb NewL
- COMMAND comsdbtblview NewL NETWORKING-Wlan-Transfer-0003-0001-NewL_command02
- COMMAND scktserv SetOutgoingIap NETWORKING-Wlan-Transfer-0003-0001-SetOutgoingIap_command03
- COMMAND comsdbtblview ~
- COMMAND comsdb ~
- COMMAND scktserv Connect
- COMMAND rcntion Open NETWORKING-Wlan-Transfer-0003-0001-Open_command07
- COMMAND rcntion Start NETWORKING-Wlan-Transfer-0003-0001-Start_command08
- COMMAND rsckt Open NETWORKING-Wlan-Transfer-0003-0001-Open_command09
- COMMAND rsckt Connect NETWORKING-Wlan-Transfer-0003-0001-Connect_command10
- OUTSTANDING
- COMMAND rsckt DownloadSendHTTPGet NETWORKING-Wlan-Transfer-0003-0001-DownloadSendHTTPGet_command11
- OUTSTANDING
- COMMAND rsckt RecvOneOrMore NETWORKING-Wlan-Transfer-0003-0001-RecvOneOrMore_command12
- COMMAND rsckt Shutdown
- OUTSTANDING
- COMMAND rsckt Close
- COMMAND rcntion Close
- COMMAND scktserv Close
- END_TEST_BLOCK
-END_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-TRANSFER-0003
-
-
-
-
-START_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-TRANSFER-0004
-
-//!@SYMTestCaseID NETWORKING-WLAN-VALIDATION-AUTOMATED-TRANSFER-0004
-//!@SYMAPI
-//! CCommsDatabase::NewL(TBool);
-//! CCommsDbTableView::OpenIAPTableViewMatchingBearerSetLC(TUint32, TCommDbConnectionDirection);
-//! CWlanMgmtClient::NewL()
-//! MWlanMgmtInterface::GetScanResults(CWlanScanInfo{ref});
-//! MWlanScanInfoBase::InformationElement( TUint8, TUint8{ref}, const TUint8{ptr}{ptr} ) ;
-//! CCommsDbTableView::GotoFirstRecord();
-//! CCommsDbTableView::ReadTextL(const TDesC{ref}, TDes16{ref});
-//! CCommsDbTableView::ReadUintL(const TDesC{ref}, TUint32{ref});
-//! CWLanSettings::GetWlanSettings(TUint32,SWLANSettings{ref});
-//! CWLanSettings::WriteWlanSettings(SWLANSettings{ref});
-//! CWLanSettings::Disconnect();
-//! CCommsDbTableView::GotoNextRecord();
-//! RSocketServ::Connect(TUint);
-//! RConnection::Open(RSocketServ{ref}, TUint);
-//! RConnection::Start(TConnPref{ref});
-//! RSocket::Open(RSocketServ{ref},TUint,TUint,TUint, RConnection{ref});
-//! RSocket::Connect(TSockAddr{ref},TRequestStatus{ref});
-//! RSocket::RecvOneOrMore(TDes8{ref},TUint,TRequestStatus{ref},TSockXfrLength{ref});
-//! RSocket::Shutdown(TShutdown,TRequestStatus{ref});
-//!
-//!@SYMAuthor alavariega
-//!@SYMCreationDate 23/06/2008
-//!@SYMTestCaseDesc Wlan Upload 10MB from User Disk
-//!@SYMTestActions
-//! 1.- Instantiate a CCOMMSDB: NewL
-//! 2.- Instantiate a CCOMMSDBTABLEVIEW: NewL ( commsdb = comsdb )
-//! 3.- GenerateFile ( File = {driveC,mmc}\10mb2.bin; Size = 10485760 )
-//! 4.- SetOutgoingIap ( WLANIAP = {IAP,Iap}; DEFAULT_SSID = {IAP,Ssid}; commsdbtableview = comsdbtblview )
-//! 5.- Destroy a CCOMMSDBTABLEVIEW object: ~
-//! 6.- Destroy a CCOMMSDB object: ~
-//! 7.- ConnectSocketServ
-//! 8.-OpenRConnection ( socketserv = scktserv )
-//! 9.- StartRConnection ( socketserv = scktserv )
-//! 10.- OpenSocket ( socketserv = scktserv; connection = rcntion )
-//! 11.- ConnectSocket ( Ip = {UploadServer,Ip}; Port = {UploadServer,Port} )
-//! 12.- UploadSendHTTPPost ( File = {driveC,mmc}\10mb2.bin; FileServer = 10mb2.bin; clientID = SALT; serverScript = /dy/upload/upfile.php )
-//! 13.- ReceiveHTTPResponse ( Save = KNullDesC )
-//! 14.- ShutDownSocket
-//! 15.- CloseSocket
-//! 16.- CloseConnection
-//! 17.- CloseSocketServ
-//!@SYMTestStatus Verified
-//!@SYMTestPriority Normal
-//!@SYMTestExpectedResults
-//! Upload a 10MB from User Disk with no errors
-//!@SYMTestType CIT
-
- START_TEST_BLOCK 6000000 T_Wlan \nt\wlan\networking-wlan-validation-automated-transfer.ini
- CREATE_OBJECT CCommsDatabase comsdb
- CREATE_OBJECT CCommsDbTableView comsdbtblview
- CREATE_OBJECT RSocketServ scktserv
- CREATE_OBJECT RConnection rcntion
- CREATE_OBJECT RSocket rsckt
- CREATE_OBJECT RFile rfile
- COMMAND comsdb NewL
- COMMAND comsdbtblview NewL NETWORKING-Wlan-Transfer-0004-0001-NewL_command02
- COMMAND rfile GenerateFile NETWORKING-Wlan-Transfer-0004-0001-GenerateFile_command03
- COMMAND scktserv SetOutgoingIap NETWORKING-Wlan-Transfer-0004-0001-SetOutgoingIap_command04
- COMMAND comsdbtblview ~
- COMMAND comsdb ~
- COMMAND scktserv Connect
- COMMAND rcntion Open NETWORKING-Wlan-Transfer-0004-0001-Open_command08
- COMMAND rcntion Start NETWORKING-Wlan-Transfer-0004-0001-Start_command09
- COMMAND rsckt Open NETWORKING-Wlan-Transfer-0004-0001-Open_command10
- COMMAND rsckt Connect NETWORKING-Wlan-Transfer-0004-0001-Connect_command11
- OUTSTANDING
- COMMAND rsckt UploadSendHTTPPost NETWORKING-Wlan-Transfer-0004-0001-UploadSendHTTPPost_command12
- COMMAND rsckt RecvOneOrMore NETWORKING-Wlan-Transfer-0004-0001-RecvOneOrMore_command13
- COMMAND rsckt Shutdown
- OUTSTANDING
- COMMAND rsckt Close
- COMMAND rcntion Close
- COMMAND scktserv Close
- END_TEST_BLOCK
-END_TESTCASE NETWORKING-WLAN-VALIDATION-AUTOMATED-TRANSFER-0004
-
-DELAY 10000
-
--- a/wlanapitest/wlanhaitest/wlan/src/T_CCommsDatabaseData.cpp Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,163 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-#include "t_ccommsdatabasedata.h"
-
-/*@{*/
-//LIT's for commands of CT_CCommsDatabaseData
-_LIT(KCmdNewL, "NewL");
-_LIT(KCmdDestructor, "~");
-/*@}*/
-
-/**
- * Two phase constructor
- *
- * @leave system wide error
- */
-CT_CCommsDatabaseData* CT_CCommsDatabaseData::NewL()
- {
- CT_CCommsDatabaseData* ret = new (ELeave) CT_CCommsDatabaseData();
- CleanupStack::PushL(ret);
- ret->ConstructL();
- CleanupStack::Pop(ret);
- return ret;
- }
-
-/**
- * Public destructor
- */
-CT_CCommsDatabaseData::~CT_CCommsDatabaseData()
- {
- DestroyData();
- }
-
-/**
- * Private constructor. First phase construction
- */
-
-CT_CCommsDatabaseData::CT_CCommsDatabaseData()
-: iCommsDat(NULL)
- {
- }
-
-/**
- * Second phase construction
- *
- * @internalComponent
- *
- * @return N/A
- *
- * @pre None
- * @post None
- *
- * @leave system wide error
- */
-void CT_CCommsDatabaseData::ConstructL()
- {
- }
-
-/**
- * Return a pointer to the object that the data wraps
- *
- * @return pointer to the object that the data wraps
- */
-TAny* CT_CCommsDatabaseData::GetObject()
- {
- return iCommsDat;
- }
-
-/**
- * Process a command read from the Ini file
- * @param aCommand The command to process
- * @param aSection The section get from the *.ini file of the project T_Wlan
- * @param aAsyncErrorIndex Command index dor async calls to returns errors to
- * @return TBool ETrue if the command is process
- * @leave system wide error
- */
-TBool CT_CCommsDatabaseData::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName&/* aSection*/, const TInt /*aAsyncErrorIndex*/)
- {
- TBool ret = ETrue;
-
- if(aCommand == KCmdNewL)
- {
- DoCmdNewL();
- }
- else if(aCommand == KCmdDestructor)
- {
- DoCmdDestructor();
- }
- else
- {
- ERR_PRINTF1(_L("Unknown command."));
- ret = EFalse;
- }
-
- return ret;
- }
-
-
-/**
- * Command to create an Instance of CCommsDatabase class
- * @param
- * @return
- */
-void CT_CCommsDatabaseData::DoCmdNewL()
- {
- INFO_PRINTF1(_L("*START* CT_CCommsDatabaseData::DoCmdNewL"));
- DestroyData();
-
- TRAPD(err,iCommsDat = CCommsDatabase::NewL(ETrue));
- if(err!=KErrNone)
- {
- ERR_PRINTF2(_L("CCommsDatabase* commsDat = CCommsDatabase::NewL(ETrue) left with error %d"), err);
- SetError(err);
- }
- else
- {
- INFO_PRINTF1(_L("CCommsDatabase* commsDat = CCommsDatabase::NewL(ETrue) was create"));
- }
-
- INFO_PRINTF1(_L("*END* CT_CCommsDatabaseData::DoCmdNewL"));
- }
-
-/**
- * Command to destroy an Instance of CCommsDatabase class
- * @param
- * @return
- */
-void CT_CCommsDatabaseData::DoCmdDestructor()
- {
- INFO_PRINTF1(_L("*START* CT_CCommsDatabaseData::DoCmdDestructor"));
- DestroyData();
- INFO_PRINTF1(_L("*END* CT_CCommsDatabaseData::DoCmdDestructor"));
- }
-
-/**
- *Helper function to DoCmdDelete command
- * @param
- * @return
- */
-void CT_CCommsDatabaseData::DestroyData()
- {
- if(iCommsDat)
- {
- delete iCommsDat;
- iCommsDat = NULL;
- }
- }
--- a/wlanapitest/wlanhaitest/wlan/src/T_CCommsDbTableViewData.cpp Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-
-#include "t_ccommsdbtableviewdata.h"
-
-// CommsDat preferences setting class.
-#include <cdbpreftable.h>
-#include <commdbconnpref.h>
-
-/*@{*/
-//LIT for the data read from the ini file
-_LIT(KCommsDb, "commsdb");
-/*@}*/
-
-/*@{*/
-//LIT's for the commands
-_LIT(KCmdNewL, "NewL");
-_LIT(KCmdDestructor, "~");
-/*@}*/
-
-/**
- * Two phase constructor
- *
- * @leave system wide error
- */
-CT_CCommsDbTableViewData* CT_CCommsDbTableViewData::NewL()
- {
- CT_CCommsDbTableViewData* ret = new (ELeave) CT_CCommsDbTableViewData();
- CleanupStack::PushL(ret);
- ret->ConstructL();
- CleanupStack::Pop(ret);
- return ret;
- }
-
-/**
- * Public destructor
- */
-CT_CCommsDbTableViewData::~CT_CCommsDbTableViewData()
- {
- DestroyData();
- }
-
-/**
- * Private constructor. First phase construction
- */
-CT_CCommsDbTableViewData::CT_CCommsDbTableViewData()
-: iSearchView(NULL)
- {
- }
-
-/**
- * Second phase construction
- *
- * @internalComponent
- *
- * @return N/A
- *
- * @pre None
- * @post None
- *
- * @leave system wide error
- */
-void CT_CCommsDbTableViewData::ConstructL()
- {
- }
-
-/**
- * Return a pointer to the object that the data wraps
- *
- * @return pointer to the object that the data wraps
- */
-TAny* CT_CCommsDbTableViewData::GetObject()
- {
- return iSearchView;
- }
-
-/**
-* Process a command read from the Ini file
-* @param aCommand The command to process
-* @param aSection The section get from the *.ini file of the project T_Wlan
-* @param aAsyncErrorIndex Command index dor async calls to returns errors to
-* @return TBool ETrue if the command is process
-* @leave system wide error
-*/
-
-TBool CT_CCommsDbTableViewData::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt/* aAsyncErrorIndex*/)
- {
- TBool ret = ETrue;
- if(aCommand == KCmdNewL)
- {
- DoCmdNewL(aSection);
- }
- else if(aCommand == KCmdDestructor)
- {
- DoCmdDestructor();
- }
- else
- {
- ERR_PRINTF1(_L("Unknown command."));
- ret = EFalse;
- }
- return ret;
- }
-
-
-
-
-/**
- * Command to create an instance of CCommsDbTableView class
- * @param aSection The section in the ini file for this command
- * @return
- */
-void CT_CCommsDbTableViewData::DoCmdNewL(const TTEFSectionName& aSection)
- {
- INFO_PRINTF1(_L("*START* CT_CCommsDbTableViewData::DoCmdNewL"));
- DestroyData();
-
- TPtrC commsDbName;
- const TUint32 KIAPMask = 0xffffffff;
- TBool dataOk = ETrue;
-
- //param from the ini file
- if(!GetStringFromConfig(aSection, KCommsDb, commsDbName))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KCommsDb);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- if (dataOk)
- {
- CCommsDatabase* acommsDat = static_cast<CCommsDatabase*>(GetDataObjectL(commsDbName));
- //CCommsDatabase* acommsDat = CCommsDatabase::NewL(ETrue);
- //iSearchView = acommsDat->OpenIAPTableViewMatchingBearerSetLC( KIAPMask, ECommDbConnectionDirectionOutgoing );
- iSearchView = acommsDat->OpenIAPTableViewMatchingBearerSetLC( KIAPMask, ECommDbConnectionDirectionOutgoing );
- CleanupStack::Pop();
- }
-
- INFO_PRINTF1(_L("*END* CT_CCommsDbTableViewData::DoCmdNewL"));
- }
-/**
- * Command for delete an instance of CCommsDbTableView class
- * @param
- * @return
- */
-void CT_CCommsDbTableViewData::DoCmdDestructor()
- {
- INFO_PRINTF1(_L("*START* CT_CCommsDbTableViewData::DoCmdDestructor"));
-
- //CleanupStack::Pop(iSearchView);
- DestroyData();
-
- INFO_PRINTF1(_L("*END* CT_CCommsDbTableViewData::DoCmdDestructor"));
- }
-
-/**
- * Helper function for the command DoCmdDelete
- * @param
- * @return
- */
-void CT_CCommsDbTableViewData::DestroyData()
- {
- if (iSearchView)
- {
- delete iSearchView;
- iSearchView = NULL;
- }
- }
--- a/wlanapitest/wlanhaitest/wlan/src/T_RConnectionData.cpp Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,254 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-#include "t_rconnectiondata.h"
-#include "t_rsocketservdata.h"
-#include <commdbconnpref.h>
-
-/*@{*/
-//LIT param read from the ini file
-_LIT(KSocketServ, "socketserv");
-/*@}*/
-
-/*@{*/
-//LITs for commands
-_LIT(KCmdOpen, "Open");
-_LIT(KCmdStart, "Start");
-_LIT(KCmdClose, "Close");
-/*@}*/
-
-
-/**
- * Two phase constructor
- *
- * @leave system wide error
- */
-CT_RConnectionData* CT_RConnectionData::NewL()
- {
- CT_RConnectionData * ret = new (ELeave)CT_RConnectionData();
- CleanupStack::PushL(ret);
- ret->ConstructL();
- CleanupStack::Pop(ret);
- return ret;
- }
-
-/**
- * Public destructor
- */
-CT_RConnectionData::~CT_RConnectionData()
- {
- if (iConnection)
- {
- delete iConnection;
- iConnection = NULL;
- }
- }
-
-/**
- * Private constructor. First phase construction
- */
-CT_RConnectionData::CT_RConnectionData()
-: iConnection(NULL)
- {
- }
-
-/**
- * Second phase construction
- *
- * @internalComponent
- *
- * @return N/A
- *
- * @pre None
- * @post None
- *
- * @leave system wide error
- */
-void CT_RConnectionData::ConstructL()
- {
- iConnection = new (ELeave)RConnection();
- }
-
-/**
- * Return a pointer to the object that the data wraps
- *
- * @return pointer to the object that the data wraps
- */
-TAny* CT_RConnectionData::GetObject()
- {
- return iConnection;
- }
-
-/**
- * Process a command read from the Ini file
- * @param aCommand The command to process
- * @param aSection The section get from the *.ini file of the project T_Wlan
- * @param aAsyncErrorIndex Command index dor async calls to returns errors to
- * @return TBool ETrue if the command is process
- * @leave system wide error
- */
-TBool CT_RConnectionData::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt /*aAsyncErrorIndex*/)
- {
- TBool ret = ETrue;
- if(aCommand == KCmdOpen)
- {
- DoCmdOpen(aSection);
- }
- else if(aCommand == KCmdStart)
- {
- DoCmdStart(aSection);
- }
- else if(aCommand == KCmdClose)
- {
- DoCmdClose();
- }
- else
- {
- ERR_PRINTF1(_L("Unknown command."));
- ret= EFalse;
- }
- return ret;
- }
-
-
-/**
- * Command to open a connection (RConnection::Open). The errors are management
- * with SetError() and SetBlockResult().
- * @param aSection Section in the ini file for this command
- * @return
- */
-void CT_RConnectionData::DoCmdOpen(const TTEFSectionName& aSection)
- {
- INFO_PRINTF1(_L("*START* CT_RConnectionData::DoCmdOpen"));
- TBool dataOk = ETrue;
-
- // read param from the ini file
- TPtrC socketServName;
- if(!GetStringFromConfig(aSection, KSocketServ, socketServName))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KSocketServ);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- if (dataOk)
- {
- RSocketServ* iSocketServ = static_cast<RSocketServ*>(GetDataObjectL(socketServName));
-
- // Open a connection
- TInt err = iConnection->Open(*iSocketServ);
- if(err == KErrNone)
- {
- INFO_PRINTF1(_L("The connection was opened"));
- }
- else
- {
- ERR_PRINTF2(_L("iConnection->Open( iSocketServ ) Failed with error %d"), err);
- SetError(err);
- }
-
- INFO_PRINTF1(_L("*END* CT_RConnectionData::DoCmdOpen"));
- }
- }
-
-/**
- * Command to Start a connection with the ID IAP given before in the wrapper CT_RSocketServData. The
- * errors are management with SetError() and SetBlockResult()
- * @param aSection Section in the ini file for this command
- * @return
- */
-void CT_RConnectionData::DoCmdStart(const TTEFSectionName& aSection)
- {
- INFO_PRINTF1(_L("*START* CT_RConnectionData::DoCmdStart"));
- TBool dataOk = ETrue;
-
- // read a param from the ini file
- TPtrC socketServName;
- if(!GetStringFromConfig(aSection, KSocketServ, socketServName))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KSocketServ);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- if (dataOk)
- {
- TInt err(KErrNone);
- TUint32 id;
-
- // Get complete wrapper
- CT_RSocketServData* iSocketServ = static_cast<CT_RSocketServData*>(GetDataWrapperL(socketServName));
- INFO_PRINTF2(_L("iSocketServ: %S"), &socketServName);
-
- if(iSocketServ != NULL)
- {
- // Start the connection using the given (WLAN) access point
- id = iSocketServ->GetIapID();
- INFO_PRINTF2(_L("CT_RConnectionData::DoCmdStart: Start RConnection, using IAP [%d]"), id);
-
- TCommDbConnPref* connPref = new (ELeave) TCommDbConnPref;
- connPref->SetIapId(id);
- connPref->SetDialogPreference( ECommDbDialogPrefDoNotPrompt );
- connPref->SetDirection( ECommDbConnectionDirectionOutgoing );
- connPref->SetBearerSet(KCommDbBearerUnknown);
-
- INFO_PRINTF1(_L("CT_RConnectionData: Starting connection"));
- // Wait before the connection is really made
- // Wait time is 8 seconds.
- err = iConnection->Start( *connPref ) ;
- if(err != KErrNone)
- {
- ERR_PRINTF2(_L("iConnection->Start( connPref ) Fail: %d "),err);
- SetError(err);
- }
- }
- else
- {
- ERR_PRINTF1(_L("CT_RConnectionData::DoCmdStart: iSocketServ is NULL"));
- SetBlockResult(EFail);
- }
- }
-
- INFO_PRINTF1(_L("*END* CT_RConnectionData::DoCmdStart"));
- }
-
-
-/**
- * Command to close a connection(RConnection::Close)
- * @param
- * @return
- */
-void CT_RConnectionData::DoCmdClose()
- {
- INFO_PRINTF1(_L("*START* CT_RConnectionData::DoCmdClose"));
- Close();
- INFO_PRINTF1(_L("*END* CT_RConnectionData::DoCmdClose"));
- }
-
-/**
- * Helper function for the command DoCmdConnection
- * @param
- * @return
- */
-
-void CT_RConnectionData::Close()
- {
- INFO_PRINTF1(_L("Closing connection"));
- iConnection->Close();
- }
--- a/wlanapitest/wlanhaitest/wlan/src/T_RFileData.cpp Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,192 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-#include "t_rfiledata.h"
-
-/*@{*/
-//LIT for the command DoCmdGenerateFile
-_LIT(KCmdGenerateFile, "GenerateFile");
-/*@}*/
-
-/*@{*/
-//LITs for param reads from the ini file
-_LIT(KFile, "File");
-_LIT(KSize, "Size");
-/*@}*/
-
-
-/**
- * Two phase constructor
- *
- * @leave system wide error
- */
-CT_RFileData* CT_RFileData::NewL()
- {
- CT_RFileData* ret = new (ELeave) CT_RFileData();
- CleanupStack::PushL(ret);
- ret->ConstructL();
- CleanupStack::Pop(ret);
- return ret;
- }
-
-/**
- * Public destructor
- */
-CT_RFileData::~CT_RFileData()
- {
- iFs.Close();
-
- if (iFile)
- {
- delete iFile;
- iFile = NULL;
- }
- }
-
-/**
- * Private constructor. First phase construction
- */
-CT_RFileData::CT_RFileData()
-: iFile(NULL),
- iFs()
- {
- }
-
-/**
- * Second phase construction
- *
- * @internalComponent
- *
- * @return N/A
- *
- * @pre None
- * @post None
- *
- * @leave system wide error
- */
-void CT_RFileData::ConstructL()
- {
- iFile = new (ELeave)RFile();
- }
-
-/**
- * Return a pointer to the object that the data wraps
- *
- * @return pointer to the object that the data wraps
- */
-TAny* CT_RFileData::GetObject()
- {
- return iFile;
- }
-
-/**
- * Process a command read from the Ini file
- * @param aCommand The command to process
- * @param aSection The section get from the *.ini file of the project T_Wlan
- * @param aAsyncErrorIndex Command index dor async calls to returns errors to
- * @return TBool ETrue if the command is process
- * @leave system wide error
- */
-
-TBool CT_RFileData::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt /*aAsyncErrorIndex*/)
- {
- TBool ret =ETrue;
- if(aCommand == KCmdGenerateFile())
- {
- DoCmdGenerateFile(aSection);
- }
- else
- {
- ERR_PRINTF1(_L("Unknown command."));
- ret = EFalse;
- }
- return ret;
- }
-
-
-/**
- * Command to generate a file for uploading in a host. If there are errors, SetBlockResult() and SetError()
- * are used for management.
- * @param aSection Section in the ini file for this command
- * @return
- */
-void CT_RFileData::DoCmdGenerateFile(const TTEFSectionName& aSection)
- {
- INFO_PRINTF1(_L("*START* CT_RFileData::DoCmdGenerateFile"));
-
- TBool dataOk = ETrue;
-
- TPtrC file;
- if(!GetStringFromConfig(aSection, KFile, file))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KFile);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- TInt size;
- if(!GetIntFromConfig(aSection, KSize, size))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KSize);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- if (dataOk)
- {
- INFO_PRINTF1(_L("Connect RFs"));
-
- CleanupClosePushL( iFs );
- CleanupClosePushL( *iFile );
-
- TInt err = iFs.Connect();
- if(err == KErrNone)
- {
- INFO_PRINTF1(_L("Replace file"));
- err = iFile->Replace( iFs, file, EFileShareAny|EFileWrite );
- if(err == KErrNone)
- {
- INFO_PRINTF1(_L("Set file size"));
- err = iFile->SetSize( size );
- if(err != KErrNone)
- {
- ERR_PRINTF2(_L("CT_RFileData::DoCmdGenerateFile: file.SetSize(...) Failed with error %d"), err);
- SetError(err);
- }
- }
- else
- {
- ERR_PRINTF2(_L("CT_RFileData::DoCmdGenerateFile: file.Replace(...) Failed with error %d"), err);
- SetError(err);
- }
- }
- else
- {
- ERR_PRINTF2(_L("CT_RFileData::DoCmdGenerateFile: fs.Connect() Failed with error %d"), err);
- SetError(err);
- }
-
- INFO_PRINTF1(_L("Close RFile handle"));
- CleanupStack::PopAndDestroy( iFile );
- INFO_PRINTF1(_L("Close RFs handle"));
- CleanupStack::PopAndDestroy( &iFs );
- }
-
- INFO_PRINTF1(_L("*END* CT_RFileData::DoCmdGenerateFile"));
- }
--- a/wlanapitest/wlanhaitest/wlan/src/T_RSocketData.cpp Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1359 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-#include <wlanscaninfo.h>
-#include "t_rsocketdata.h"
-
-/*@{*/
-// LITs from the ini file
-_LIT( KSocketServ, "socketserv");
-_LIT( KConnection, "connection");
-_LIT( KScanInfo, "scaninfo");
-_LIT( KAddress, "Ip");
-_LIT( KPort, "Port");
-_LIT( KFile, "File");
-_LIT( KSave, "Save");
-_LIT( KARates, "rate");
-_LIT( KFileServer, "FileServer");
-/*@}*/
-
-/*@{*/
-// Upload
-_LIT(KNullFile, "KNullDesC");
-/*@}*/
-
-/*@{*/
-// LITs for the commands
-_LIT( KCmdOpen, "Open");
-_LIT( KCmdConnect, "Connect");
-_LIT( KCmdHttpGet, "HttpGet");
-_LIT( KCmdDownloadSendHTTPGet, "DownloadSendHTTPGet");
-_LIT( KCmdRecvOneOrMore, "RecvOneOrMore");
-_LIT( KCmdUploadSendHTTPPost, "UploadSendHTTPPost");
-_LIT( KCmdCheckSupportedRates, "CheckSupportedRates");
-_LIT( KCmdShutdown, "Shutdown");
-_LIT( KCmdClose, "Close");
-/*@}*/
-
-/*@{*/
-// Constants for creating a HTTP request in the command DoCmdDownloadSendHTTPGet
-_LIT8( KHTTPGET, "GET");
-_LIT8( KHTTPSeparator, " ");
-_LIT8( KHTTPSuffix, "HTTP/1.1");
-_LIT( KHostS, "Host");
-_LIT8( KLineFeed, "\r\n");
-_LIT8( KEmptyLine, "\r\n\r\n");
-_LIT8( KHeaderEndMark, "\r\n\r\n" );
-_LIT8( KContentLengthField, "Content-Length: ");
-_LIT8( KFieldEnd, "\r\n" );
-_LIT8( KGETHTTP, "GET / HTTP/1.0\r\n\r\n" );
-/*@}*/
-
-/*@{*/
-// Constants for CreateHTTPHeaderStart
-_LIT8(KHTTPPOST, "POST");
-_LIT8(KLineBreak, "\r\n");
-_LIT(KClientID, "clientID");
-_LIT(KServerScript, "serverScript");
-_LIT8(KFrom, "From:");
-_LIT8(KHosts, "Host:");
-_LIT8(KContentType, "Content-Type:");
-_LIT8(KContentLength, "Content-Length:");
-_LIT8(KContentDisposition, "Content-Disposition:");
-_LIT8(KMultipartType, "multipart/form-data;");
-_LIT8(KOctetType, "application/octet-stream");
-_LIT8(KBoundary, "boundary=---------------------------sg976436h73");
-_LIT8(KBoundaryStart, "-----------------------------sg976436h73");
-_LIT8(KDisposition, "form-data; name=\"userfile\"; filename=");
-_LIT8(KBackS, "\"");
-_LIT8(KBoundaryEnd, "-----------------------------sg976436h73--");
-/*@}*/
-
-
-const TInt KHttpHeaderBufferIncrement = 4096;
-// Const for supported rates
-// The first bit includes information about BSSBasicRateSet,
-// mask it out
-
-const TUint32 KBasicRateMask = 0x7F;
-// 802.11g supported speed rate
-const TUint8 K80211Rate1Mbit = 2;
-const TUint8 K80211Rate2Mbit = 4;
-const TUint8 K80211Rate5Mbit = 11;
-const TUint8 K80211Rate11Mbit = 22;
-const TUint8 K80211Rate12Mbit = 24;
-const TUint8 K80211Rate18Mbit = 36;
-const TUint8 K80211Rate22Mbit = 44;
-const TUint8 K80211Rate24Mbit = 48;
-const TUint8 K80211Rate33Mbit = 66;
-const TUint8 K80211Rate36Mbit = 72;
-const TUint8 K80211Rate48Mbit = 96;
-const TUint8 K80211Rate54Mbit = 108;
-
-
-
-
-
-
-
-/**
- * Two phase constructor
- *
- * @leave system wide error
- */
-CT_RSocketData* CT_RSocketData::NewL()
- {
- CT_RSocketData * ret = new (ELeave)CT_RSocketData();
- CleanupStack::PushL(ret);
- ret->ConstructL();
- CleanupStack::Pop(ret);
- return ret;
- }
-
-/*
- *RunL method for management Active callbacks
- * @param aActive param to review which active call back is being fished
- * @param aIndex
- * @return void
- */
-void CT_RSocketData::RunL(CActive* aActive, TInt /*aIndex*/)
- {
- INFO_PRINTF1(_L("*START* CT_RSocketData::RunL"));
- DecOutstanding(); // One of the async calls has completed
- TInt err(KErrNone);
- if(aActive == iActiveCallback)
- {
- INFO_PRINTF1(_L("active call back for Write Socket."));
- err = iActiveCallback->iStatus.Int();
- if(err != KErrNone)
- {
- ERR_PRINTF1(_L("iSocket->Write(...) Fail"));
- SetError(err);
- }
- else
- {
- INFO_PRINTF2(_L("CT_RSocketData::SendHTTPGet [%d]"), iActiveCallback->iStatus.Int());
- INFO_PRINTF1(_L("Asynchronous task has completed. RunL called"));
- }
- }
- else if(aActive == iActCallConnectSocket)
- {
- INFO_PRINTF1(_L("active call back for Connect Socket."));
- err = iActCallConnectSocket->iStatus.Int();
- if(err != KErrNone)
- {
- ERR_PRINTF1(_L("iSocket->Connect(...) Fail"));
- SetError(err);
- }
- else
- {
- INFO_PRINTF1(_L("CT_RSocketData::DoCmdConnect(...) success"));
- iSocketOpened = ETrue;
- }
- }
- else if(aActive == iActCallShutDownSocket)
- {
- INFO_PRINTF1(_L("active call back for Shutdown Socket."));
- err = iActCallShutDownSocket->iStatus.Int();
- if(err != KErrNone)
- {
- ERR_PRINTF2(_L("iSocket->Shutdown(...): [%d] Fail"),iActCallShutDownSocket->iStatus.Int());
- SetError(err);
- }
- else
- {
- INFO_PRINTF1(_L("CT_RSocketData::Shutdown success"));
- iSocketStarted = EFalse;
- }
- }
- else
- {
- ERR_PRINTF1(_L("An unchecked active object completed"));
- SetBlockResult(EFail);
- }
-
- INFO_PRINTF1(_L("*END* CT_RSocketData::RunL"));
- }
-/*
- * public destructor
- */
-CT_RSocketData::~CT_RSocketData()
- {
- if (iSocketStarted)
- {
- INFO_PRINTF1(_L("CT_RSocketData: Shutting down socket"));
- Shutdown();
- }
- if (iSocketOpened)
- {
- Close();
- }
- if (iDownloadBuffer)
- {
- delete iDownloadBuffer;
- iDownloadBuffer = NULL;
- }
- if (iSocket)
- {
- delete iSocket;
- iSocket = NULL;
- }
- if (iActiveCallback)
- {
- delete iActiveCallback;
- iActiveCallback = NULL;
- }
- if (iActCallShutDownSocket)
- {
- delete iActCallShutDownSocket;
- iActCallShutDownSocket = NULL;
- }
- if (iActCallConnectSocket)
- {
- delete iActCallConnectSocket;
- iActCallConnectSocket = NULL;
- }
-
- iFs.Close();
-
- if (iUploadBuffer)
- {
- delete iUploadBuffer;
- iUploadBuffer = NULL;
- }
- }
-
-/**
- * Private constructor. First phase construction
- *
- */
-CT_RSocketData::CT_RSocketData()
-: iSocket(NULL),
- iActiveCallback(NULL),
- iActCallConnectSocket(NULL),
- iActCallShutDownSocket(NULL),
- iSocketOpened(EFalse),
- iSocketStarted(EFalse),
- iAsyncErrorIndex(0),
- iDownloadBuffer(NULL),
- iUploadBuffer(NULL),
- iHttpResponseHeader(),
- iDownloadThroughput(0.0),
- iFs(),
- iUploadThroughput(0.0),
- itotalReceived(0)
- {
-
- }
-
-/**
- * Second phase construction
- *
- * @internalComponent
- *
- * @return N/A
- *
- * @pre None
- * @post None
- *
- * @leave system wide error
- */
-void CT_RSocketData::ConstructL()
- {
- const TInt KDefaultBufferSize = 4096;
- TInt err(KErrNone);
- iSocket = new (ELeave) RSocket();
- iActiveCallback = CActiveCallback::NewL(*this);
- iActCallConnectSocket = CActiveCallback::NewL(*this);
- iActCallShutDownSocket = CActiveCallback::NewL(*this);
- iDownloadBuffer = HBufC8::NewL( KDefaultBufferSize);
- iUploadBuffer = HBufC8::NewL(KDefaultBufferSize);
- err = iFs.Connect();
- if(err != KErrNone)
- {
- SetError(err);
- }
- }
-
-
-/**
- * Return a pointer to the object that the data wraps
- *
- * @return pointer to the object that the data wraps
- */
-TAny* CT_RSocketData::GetObject()
- {
- return iSocket;
- }
-
-
-
-/**
- * Process a command read from the Ini file
- * @param aCommand The command to process
- * @param aSection The section get from the *.ini file of the project T_Wlan
- * @param aAsyncErrorIndex Command index for async calls to returns errors to
- * @return TBool ETrue if the command is process
- * @leave system wide error
- *
- */
-TBool CT_RSocketData::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt aAsyncErrorIndex)
- {
- TBool ret = ETrue;
- if(aCommand == KCmdOpen )
- {
- DoCmdOpen(aSection);
- }
- else if(aCommand == KCmdConnect)
- {
- DoCmdConnect(aSection,aAsyncErrorIndex);
- }
- else if(aCommand == KCmdDownloadSendHTTPGet)
- {
- DoCmdDownloadSendHTTPGet(aSection,aAsyncErrorIndex);
- }
- else if(aCommand == KCmdRecvOneOrMore)
- {
- DoCmdRecvOneOrMore(aSection);
- }
- else if(aCommand == KCmdUploadSendHTTPPost)
- {
- DoCmdUploadSendHTTPPost(aSection);
- }
- else if(aCommand == KCmdShutdown)
- {
- DoCmdShutdown(aAsyncErrorIndex);
- }
- else if(aCommand == KCmdClose)
- {
- DoCmdClose();
- }
- else if(aCommand == KCmdHttpGet)
- {
- DoCmdHttpGet();
- }
- else if(aCommand == KCmdCheckSupportedRates)
- {
- DoCmdCheckSupportedRates(aSection);
- }
- else
- {
- ERR_PRINTF1(_L("Unknown command."));
- ret = EFalse;
- }
- return ret;
- }
-
-
-
-
-/**
- * Open the Socket from RSocket. The errors are management with SetError() and SetBlockResult().
- * @param aSection Section in the ini file for this command.
- * @return
- */
-void CT_RSocketData::DoCmdOpen(const TTEFSectionName& aSection)
- {
- INFO_PRINTF1(_L("*START* CT_RSocketData::DoCmdOpen"));
- TBool dataOk = ETrue;
-
- TPtrC connectionName;
- if(! GetStringFromConfig(aSection, KConnection, connectionName))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KConnection);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- TPtrC socketServName;
- if(! GetStringFromConfig(aSection, KSocketServ, socketServName))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KSocketServ);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- if (dataOk)
- {
- INFO_PRINTF1(_L("Opening a TCP/IP socket"));
-
- RConnection* rConnection = static_cast<RConnection*>(GetDataObjectL(connectionName));
- RSocketServ* rSocketServ = static_cast<RSocketServ*>(GetDataObjectL(socketServName));
-
- if(rConnection != NULL && rSocketServ != NULL)
- {
- TInt error = iSocket->Open( *rSocketServ, KAfInet, KSockStream, KProtocolInetTcp, *rConnection );
-
- if(error == KErrNone)
- {
- iSocketOpened = ETrue;
- }
- else
- {
- ERR_PRINTF2(_L("Socket opening failed [%d]"), error);
- SetError(error);
- }
- }
- else
- {
- if(rConnection == NULL)
- {
- ERR_PRINTF2(_L("rConnection is NULL: %S"),rConnection);
- SetBlockResult(EFail);
- }
-
- if(rSocketServ == NULL)
- {
- INFO_PRINTF2(_L("rSocketServ is NULL: %S"),rSocketServ);
- SetBlockResult(EFail);
- }
- }
- }
-
- INFO_PRINTF1(_L("*END* CT_RSocketData::DoCmdOpen"));
- }
-
-/**
- * Command to Connect a Socket of RSocket.
- * @param aSection Section to read from the ini file
- * @param aAsyncErrorIndex Command index for async calls to returns errors to
- * @return
- */
-void CT_RSocketData::DoCmdConnect(const TTEFSectionName& aSection, const TInt aAsyncErrorIndex)
- {
- INFO_PRINTF1(_L("*START* CT_RSocketData::DoCmdConnect"));
- TBool dataOk = ETrue;
-
- //Getting from the .ini the IP Address
- TPtrC aIpAddr;
- if(!GetStringFromConfig( aSection, KAddress, aIpAddr ))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KAddress);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- //Getting the port from the file ini
- TInt aPort;
- if(!GetIntFromConfig( aSection, KPort,aPort ))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KPort);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- if(dataOk)
- {
- // Set the IP Address
- TInetAddr inetAddr;
- TInt err = inetAddr.Input( aIpAddr ) ;
- if(err == KErrNone)
- {
- INFO_PRINTF2(_L("Remote IP: %S"), &aIpAddr );
- INFO_PRINTF2( _L("Port: %d"), aPort );
- // Set the port
- inetAddr.SetPort( aPort );
- // Connect an IP through the Port 80
- iSocket->Connect( inetAddr, iActCallConnectSocket->iStatus );
- iActCallConnectSocket->Activate(aAsyncErrorIndex);
- IncOutstanding();
- }
- else
- {
- ERR_PRINTF2(_L("inetAddr.Input( aIpAddr ) Failed with error %d"), err);
- SetError(err);
- }
- }
-
- INFO_PRINTF1(_L("*END* CT_RSocketData::DoCmdConnect"));
- }
-
-/**
- * Command to send the HTTP Get, using the socket Write.
- * @param aSection Section to read from the ini file
- * @param aAsyncErrorIndex Command index for async calls to returns errors to
- * @return
- */
-void CT_RSocketData::DoCmdDownloadSendHTTPGet(const TTEFSectionName& aSection, const TInt aAsyncErrorIndex )
- {
- INFO_PRINTF1(_L("*START* CT_RSocketData::DoCmdDownloadSendHTTPGet"));
- TBool dataOk = ETrue;
-
- // Read params from the ini file
- TPtrC aHost;
- if(!GetStringFromConfig( aSection, KHostS, aHost))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KHostS);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- TPtrC aFilename;
- if(!GetStringFromConfig( aSection, KFile, aFilename ))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KFile);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- if (dataOk)
- {
- const TInt KMaxHostNameLength(256);
- if( aHost.Length() > KMaxHostNameLength )
- {
- ERR_PRINTF1(_L("Host is too long, cannot send HTTP request"));
- SetBlockResult(EFail);
- }
- else if( aFilename.Length() > KMaxFileName )
- {
- ERR_PRINTF1(_L("Filename is too long, cannot send HTTP request"));
- SetBlockResult(EFail);
- }
- else
- {
- INFO_PRINTF1(_L("Create HTTP GET request"));
- // Buffer that will hold the request.
- TBuf8< sizeof( KHTTPGET ) +
- sizeof( KHTTPSeparator ) +
- KMaxFileName +
- sizeof( KHTTPSeparator ) +
- sizeof( KHTTPSuffix ) +
- sizeof( KLineFeed ) +
- sizeof( KHosts ) +
- KMaxHostNameLength +
- sizeof( KEmptyLine ) > request;
- // Construct the final request.
- request.Copy( KHTTPGET );
- request.Append( KHTTPSeparator );
- request.Append( aFilename );
- request.Append( KHTTPSeparator );
- request.Append( KHTTPSuffix );
- request.Append( KLineFeed );
- request.Append( KHosts );
- request.Append( aHost );
- request.Append( KEmptyLine );
-
- INFO_PRINTF1(_L("Write to socket"));
- // Send the request through socket
- iSocket->Write(request, iActiveCallback->iStatus);
- iActiveCallback->Activate(aAsyncErrorIndex);
- IncOutstanding();
- }
- }
-
- INFO_PRINTF1(_L("*END* CT_RSocketData::DoCmdDownloadSendHTTPGet"));
- }
-
-/**
- * Command to receive an HTTP Response for Upload and Download of files.
- * @param aSection Section to read from the ini file
- * @return
- */
-void CT_RSocketData::DoCmdRecvOneOrMore(const TTEFSectionName& aSection)
- {
- INFO_PRINTF1(_L("*START* CT_RSocketData::DoCmdRecvOneOrMore"));
- TBool dataOk = ETrue;
-
- // Read from the ini file
- TPtrC aFilename;
- if(!GetStringFromConfig( aSection, KSave,aFilename ))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KSave);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- if (dataOk)
- {
- RFile file;
- TInt error = KErrNone;
-
- //if KNullFile then Upload
- TBool discardData = ( aFilename == KNullFile);
- INFO_PRINTF2(_L("File and path to Download: %S"),&aFilename);
- if( !discardData )
- {
- INFO_PRINTF1( _L("Data is not discarded, creating file") );
- error = file.Replace( iFs, aFilename, EFileShareAny|EFileWrite );
- }
- else
- {
- INFO_PRINTF1( _L("Discarding downloaded data") );
- }
-
- if( error == KErrNone )
- {
- TSockXfrLength received;
- TInt totalReceived = 0;
- TInt contentReceived = 0;
- TInt timedReceived = 0;
- TInt contentLength = 0;
- TRequestStatus status;
- TPtr8 downloadBufferPtr( iDownloadBuffer->Des() );
-
- downloadBufferPtr.SetMax();
- INFO_PRINTF2( _L("Using buffer size [%d]"), downloadBufferPtr.MaxSize() );
-
- INFO_PRINTF1(_L("Set time stamps for download"));
- TTime endTime;
- TTime startTime;
-
- INFO_PRINTF1( _L("Receiving data"));
-
- // Let's assume that we receive a HTTP header first
- TBool header( ETrue );
- TBool timerStarted( EFalse );
- TBool failure = EFalse; // a flag to delete multiple returns
-
- iHttpResponseHeader.Zero();
- // receive until RecvOneOrMore fails or all content is received
- do
- {
- if( !timerStarted && !header)
- {
- startTime.HomeTime();
- endTime.HomeTime();
- timerStarted = ETrue;
- }
-
- iSocket->RecvOneOrMore( downloadBufferPtr, 0, status, received );
- User::WaitForRequest( status );
- if( !header )
- {
- timedReceived += received();
- }
-
- if( KErrNone == status.Int() )
- {
- // Check if we are still receiving the HTTP header
- if( header )
- {
- //Increase httpResponseheader size if needed
- if(iHttpResponseHeader.Length() + downloadBufferPtr.Length() > iHttpResponseHeader.MaxLength())
- {
- error = iHttpResponseHeader.ReAlloc(iHttpResponseHeader.MaxLength() + KHttpHeaderBufferIncrement);
- if(error != KErrNone)
- {
- ERR_PRINTF2( _L("iHttpResponseHeader.ReAlloc(...) Failed with error %d"), error);
- SetError( error );
- failure = ETrue;
- break;
- }
- }
-
- //Append the donwloaded content to headerbuffer
- iHttpResponseHeader.Append(downloadBufferPtr);
- TInt headerEndIndex = iHttpResponseHeader.Find( KHeaderEndMark );
- if( headerEndIndex != KErrNotFound )
- {
- INFO_PRINTF1( _L("Header end mark found"));
- //Parse Content-Length field and extract content length
- TInt contentLengthStart = iHttpResponseHeader.Find( KContentLengthField );
- //If Content-Length field is found
- if( contentLengthStart != KErrNotFound )
- {
- INFO_PRINTF1(_L("Content-Length field found from HTTP response"));
- contentLengthStart += KContentLengthField().Length();
- TPtrC8 contentLengthDes;
- contentLengthDes.Set(iHttpResponseHeader.Mid( contentLengthStart ));
- TInt contentLengthEnd = contentLengthDes.Find( KFieldEnd );
- contentLengthDes.Set(contentLengthDes.Mid(0, contentLengthEnd));
- TLex8 lex;
- lex.Assign( contentLengthDes );
- lex.Val(contentLength);
- INFO_PRINTF2( _L("Content-Length: [%d]"), contentLength );
- }
- else
- {
- INFO_PRINTF1( _L("No Content-Length field found from HTTP response"));
- INFO_PRINTF1( _L("Assuming Content-Length: 0"));
- contentLength = 0;
- file.Close();
- error = iFs.Delete(aFilename);
- if(error != KErrNone)
- {
- INFO_PRINTF3(_L("Error [%d] for delete the file %S"), &aFilename,error);
- SetError(error);
- failure = ETrue;
- break;
- }
- ERR_PRINTF2(_L("File %S was not found"), &aFilename);
- SetBlockResult(EFail);
- failure = ETrue;
- break;
- }
- // Header was found
- headerEndIndex += KHeaderEndMark().Length();
- //Convert the headerEndIndex in httpResponseheader to index in downloadBuffer
- headerEndIndex -= totalReceived;
- //Delete remaining parts of the HTTP header from the download buffer
- downloadBufferPtr.Delete( 0, headerEndIndex );
- header = EFalse;
- }
- }
-
- // Increase the total received amount as we receive more data.
- // Note: received data count also counts headers, this is taken
- // into account in timing (startTime)
- totalReceived += received();
- if(!header)
- {
- contentReceived += downloadBufferPtr.Length();
- }
-
- if( !discardData )
- {
- error = file.Write( *iDownloadBuffer );
- if( KErrNone != error )
- {
- ERR_PRINTF2( _L("Failed to write local file [%d]"), error );
- file.Close();
- SetError(error);
- failure = ETrue;
- break;
- }
- }
- }
- else
- {
- INFO_PRINTF1(_L("Set end time"));
- endTime.HomeTime();
- INFO_PRINTF2( _L("Receiving err [%d]"), status.Int());
- break;
- }
- }
- while( KErrNone == status.Int() && contentReceived < contentLength );
-
- if (!failure)
- {
- endTime.HomeTime();
- INFO_PRINTF2( _L("Received total of [%d] bytes (inc headers)"), totalReceived );
- INFO_PRINTF2( _L("Content received [%d] bytes"), contentReceived );
-
- //Set this printing optional
- //Print only if any amount of datatransfer was timed (skipped in the case of very short data transfers)
- if( timerStarted )
- {
- INFO_PRINTF1(_L("Calculate duration of the transfer"));
- TTimeIntervalMicroSeconds duration = endTime.MicroSecondsFrom( startTime );
- INFO_PRINTF2( _L("Duration for the timed data transfer was [%Ld] microseconds"), duration.Int64() );
- INFO_PRINTF2( _L("Received [%d] bytes during timed data transfer"), timedReceived);
- iDownloadThroughput = ThroughputInMegaBits( duration, timedReceived );
- }
- else
- {
- INFO_PRINTF1( _L("Data transfer too short for throughput calculation"));
- }
-
- // We allow any response to our reply at the moment.
- if( !discardData )
- {
- file.Close();
- }
- }
- }
- else
- {
- ERR_PRINTF2( _L("Failed to open local file [%d]"), error );
- SetError(error);
- }
- }
-
- INFO_PRINTF1(_L("*END* CT_RSocketData::DoCmdRecvOneOrMore"));
- }
-
-/**
- * Create an HTTP Post for uploading files.
- * @param aSection Section to read from the ini file
- * @return
- */
-void CT_RSocketData::DoCmdUploadSendHTTPPost(const TTEFSectionName& aSection)
- {
- INFO_PRINTF1(_L("*START* CT_RSocketData::DoCmdUploadSendHTTPPost"));
- TBool dataOk = ETrue;
-
- INFO_PRINTF1( _L("Write to socket"));
-
- TPtrC aFilename;
- if(!GetStringFromConfig(aSection,KFile,aFilename))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KFile);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- TPtrC fileServer;
- if(!GetStringFromConfig(aSection,KFileServer,fileServer))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KFileServer);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- TPtrC clientID;
- if(!GetStringFromConfig(aSection,KClientID,clientID))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KClientID);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- TPtrC serverScript;
- if(!GetStringFromConfig(aSection,KServerScript,serverScript))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KServerScript);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- if (dataOk)
- {
- const TInt KMaxTag = 256;
- // KHeaderWithoutData will change if you alter the header in any way that changes the
- // amount of characters in it! SO REMEMBER to calclulate header size again.
- const TInt KHeaderWithoutData = 200;
- TBuf8<KMaxTag + KHeaderWithoutData> request;
- TRequestStatus status;
-
- CreateHTTPHeaderStart(request, ReadFileSizeL(aFilename),fileServer, clientID, serverScript);
-
- iSocket->Write( request,status);
- User::WaitForRequest( status );
- if(status.Int() == KErrNone)
- {
- INFO_PRINTF1( _L("HTTP POST request send, sending payload next"));
- // Send file to iSocket
- SendFileToSocketL(aFilename);
- request.SetLength( 0 );
- CreateHTTPHeaderEnd(request);
-
- // Send the rest of the header
- INFO_PRINTF1(_L("Sending boundary end"));
- iSocket->Write( request, status );
- User::WaitForRequest( status );
- if(status.Int() != KErrNone)
- {
- ERR_PRINTF2(_L("CT_RSocketData::DoCmdUploadSendHTTPPost: iSocket->Write( request,status) Failed with error %d"), status.Int());
- SetError(status.Int());
- }
- }
- else
- {
- ERR_PRINTF2(_L("CT_RSocketData::DoCmdUploadSendHTTPPost: iSocket->Write( request,status) Failed with error %d"), status.Int());
- SetError(status.Int());
- }
- }
-
- INFO_PRINTF1(_L("*END* CT_RSocketData::DoCmdUploadSendHTTPPost"));
- }
-
-/**
- * Create or build the header for POST.
- * @param aRequest Descriptor with a lenght of 456 that contain the parameters for the POST
- * @param aDataSize Size of the file
- * @return
- */
-void CT_RSocketData::CreateHTTPHeaderStart(TDes8& aRequest, TInt aDataSize,TDesC& aFileServer, TDesC& clientID,TDesC& serverScript)
- {
- // Manually created HTTP Post request is difficult to maintain.
- // Request and server responce is logged into file during test run.
-
- // KHeaderWithoutData will change if you alter the header in any way
- // that changes the amount of characters in it! SO REMEMBER to calclulate
- // header size again.
- const TInt KHeaderWithoutData = 200;
- INFO_PRINTF1( _L("Set socket remote name"));
- TSockAddr address;
- iSocket->RemoteName( address );
-
- // Construct request
- aRequest.Append(KHTTPPOST);
- aRequest.Append(KHTTPSeparator);
- aRequest.Append(serverScript);
- aRequest.Append(KHTTPSeparator);
- aRequest.Append(KHTTPSuffix);
- aRequest.Append(KLineBreak);
-
- aRequest.Append(KHosts);
- aRequest.Append(KHTTPSeparator);
- aRequest.Append(address);
- aRequest.Append(KLineBreak);
-
- aRequest.Append(KFrom);
- aRequest.Append(KHTTPSeparator);
- aRequest.Append(clientID);
- aRequest.Append(KLineBreak);
-
- aRequest.Append(KContentType);
- aRequest.Append(KHTTPSeparator);
- aRequest.Append(KMultipartType);
- aRequest.Append(KHTTPSeparator);
- aRequest.Append(KBoundary);
- aRequest.Append(KLineBreak);
-
- aRequest.Append(KContentLength);
- aRequest.Append(KHTTPSeparator);
- // aRequest size + size of the data to be sent. Server must know how much
- // data is coming.
- aRequest.AppendNum(KHeaderWithoutData+aDataSize);
- aRequest.Append(KLineBreak);
-
- // extra line break
- aRequest.Append(KLineBreak);
-
- aRequest.Append(KBoundaryStart);
- aRequest.Append(KLineBreak);
-
- aRequest.Append(KContentDisposition);
- aRequest.Append(KHTTPSeparator);
- aRequest.Append(KDisposition);
- aRequest.Append(KBackS);
- aRequest.Append(aFileServer);
- aRequest.Append(KBackS);
- aRequest.Append(KLineBreak);
-
- aRequest.Append(KContentType);
- aRequest.Append(KHTTPSeparator);
- aRequest.Append(KOctetType);
- aRequest.Append(KLineBreak);
-
- aRequest.Append(KLineBreak);
- }
-
-/**
- * Send aFilename parameter to the Socket with RSocket::Write
- * @param aFilename name of the file send to the Socket
- * @return
- */
-void CT_RSocketData::SendFileToSocketL(const TDesC& aFilename)
- {
- TInt err(KErrNone);
- TPtr8 buffer( iUploadBuffer->Des() );
- buffer.SetMax();
- INFO_PRINTF2( _L("Using buffer size [%d]"), buffer.MaxSize() );
- TInt bytesSent = 0;
-
- INFO_PRINTF1( _L("Open file"));
- RFile file;
-
- err = file.Open(iFs, aFilename, EFileShareAny|EFileRead);
-
- if(err == KErrNone)
- {
- CleanupClosePushL( file );
- INFO_PRINTF1(_L("Read file size"));
- TInt fileSize = ReadFileSizeL(aFilename);
-
- INFO_PRINTF1( _L("Set time stamps for upload"));
- TTime endTime;
- endTime.HomeTime();
- TTime startTime;
- startTime.HomeTime();
-
- INFO_PRINTF1( _L("Send file"));
- // Loop while enough bytes are sent to socket
- while( bytesSent < fileSize )
- {
- TInt err = file.Read( buffer );
-
- if( err == KErrEof )
- {
- INFO_PRINTF1(_L("File sending finished"));
- INFO_PRINTF2( _L("Upload buffer length is [%d]"), buffer.Length());
- break;
- }
- else if( err != KErrNone )
- {
- ERR_PRINTF2( _L("Failed to read file [%d]"), err );
- SetError( err );
- break;
- }
-
- TRequestStatus status(KRequestPending);
- iSocket->Write( buffer, status );
- User::WaitForRequest( status );
- err = status.Int();
- if(err != KErrNone)
- {
- ERR_PRINTF2(_L("CT_RSocketData::SendFileToSocketL:iSocket->Write(...) Fail [%d] "),err);
- SetError(err);
- break;
- }
-
- bytesSent += ( buffer.Length() );
- }
-
- if (err == KErrNone || err == KErrEof)
- {
- INFO_PRINTF1( _L("Set end time"));
- endTime.HomeTime();
- INFO_PRINTF2( _L("Sent [%d] bytes to server"), bytesSent);
-
- INFO_PRINTF1( _L("Calculate duration of the transfer"));
- TTimeIntervalMicroSeconds duration = endTime.MicroSecondsFrom( startTime );
- INFO_PRINTF2( _L("Duration for the data transfer was [%Ld] microseconds"), duration.Int64() );
- iUploadThroughput = ThroughputInMegaBits( duration, bytesSent );
- CleanupStack::PopAndDestroy( &file );
- }
- }
- else
- {
- ERR_PRINTF2(_L("CT_RSocket::SendFileToSocketL::file.Open(...) Failed with error %d"), err);
- SetError(err);
- }
- }
-
-/**
- * Calculated the throughput based on duration of a data transfer and total transferred bytes.
- * @param aDuration Duration of the transfer
- * @param aBytes Total transferred in bytes
- * @return Throughput in MBps
- */
-TReal CT_RSocketData::ThroughputInMegaBits(TTimeIntervalMicroSeconds aDuration, TInt aBytes )
- {
- const TReal KBitsInByte(8.0);
- TReal throughput = ( KBitsInByte * (TReal) aBytes ) / (TReal) aDuration.Int64();
- return throughput;
- }
-
-/**
- * Read the lenght of the file (aFileName)
- * @param aFileName file to read the lenght
- * @return
- */
-TInt CT_RSocketData::ReadFileSizeL(const TDesC& aFilename)
- {
- RFile file;
- TInt error = file.Open(iFs, aFilename, EFileShareAny|EFileRead);
- if ( error != KErrNone)
- {
- ERR_PRINTF2( _L("Failed to open local file [%d]"), error);
- SetError(error);
- return error;
- }
-
- TInt fileSize = 0;
- error = file.Size(fileSize);
-
- if (error!= KErrNone)
- {
- ERR_PRINTF2(_L("Failed to read file size [%d]"), error);
- file.Close();
- SetError(error);
- return error;
- }
-
- file.Close();
- return fileSize;
- }
-
-/**
- * Build the final header to POST for uploading files
- * @param aRequest Descriptor with 456 of lenght that contain the final POST request
- * @return
- */
-void CT_RSocketData::CreateHTTPHeaderEnd(TDes8& aRequest)
- {
- //TRequestStatus status;
- aRequest.SetLength( 0 );
- //Create the rest of the header data
- aRequest.Append( KLineBreak );
- aRequest.Append( KBoundaryEnd );
- aRequest.Append( KLineBreak );
- }
-
-
-/**
- * Make a HTTP request to the socket
- * @param
- * @return
- */
-void CT_RSocketData::DoCmdHttpGet()
- {
- INFO_PRINTF1(_L("*START* CT_RSocketData::DoCmdHttpGet"));
-
- TInt err(KErrNone);
- //Constant for creating a HTTP request.
- const TInt KHTTPSize = 128;
- // Buffer that will hold the request.
- TBuf8 <KHTTPSize> request;
- // Construct the final request.
- request.Append( KGETHTTP );
-
- INFO_PRINTF1( _L("Write to socket") );
- TRequestStatus status( KRequestPending );
- iSocket->Write( request, status);
- User::WaitForRequest( status );
- INFO_PRINTF2( _L("CT_RSocketData::DoCmdHttpGet: Write done: [%d]"), status.Int() );
- err = status.Int();
-
- if(err == KErrNone)
- {
- INFO_PRINTF1( _L("CT_RSocketData::DoCmdHttpGet: Receive from socket") );
- // receive until RecvOneOrMore fails
- do
- {
- RecvOneOrMore(status);
- }
- while( status.Int() == KErrNone );
-
- INFO_PRINTF2( _L("CT_RSocketData::DoCmdHttpGet: Receiving finished. Received [%d] bytes in total"), itotalReceived );
-
- // Currently all error codes returned by the server are accepted.
- // Should only KErrEof be accepted?
- INFO_PRINTF2( _L("Ignoring error code from RSocket::RecvOneOrMore [%d]"), status.Int());
- }
- else
- {
- ERR_PRINTF2(_L("CT_RSocketData::DoCmdHttpGet: iSocket.Write(...) Failed with error %d"), err);
- SetError(err);
- }
-
- INFO_PRINTF1(_L("*END* CT_RSocketData::DoCmdHttpGet"));
- }
-
-/**
- * Receive data from a remote host.
- * @param status Indicates the complexion status of the request
- * @return
- */
-void CT_RSocketData::RecvOneOrMore(TRequestStatus &status)
- {
- TInt err(KErrNone);
- // Create variables for receive buffer and received data counting variables.
- const TInt KBufferSize(1024);
- TBuf8<KBufferSize> buffer;
- TSockXfrLength received;
- iSocket->RecvOneOrMore( buffer, 0, status, received);
- User::WaitForRequest( status );
- err = status.Int();
- if( err == KErrNone )
- {
- INFO_PRINTF2( _L("CWlanTestWrapper: Received [%d] bytes"), received() );
- itotalReceived += received();
- }
- else if( err == KErrEof )
- {
- INFO_PRINTF1(_L("End of File reached"));
- }
- else
- {
- ERR_PRINTF2(_L("RecvOneOrMore async call failed with error %d"), err);
- SetError(err);
- }
- }
-
-
-
-/**
- * Check the supported rates for the IAP.
- * @param aSection Section to read from the ini file
- * @return
- */
-void CT_RSocketData::DoCmdCheckSupportedRates(const TTEFSectionName& aSection)
- {
- INFO_PRINTF1(_L("*START* CT_RSocketData::DoCmdCheckSupportedRates"));
- TBool dataOk = ETrue;
-
- // Read from the ini file
- TInt aRate;
- if(!GetIntFromConfig(aSection,KARates,aRate))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KARates);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- // Check if a scan has been made
- TPtrC iScanInfoName;
- if(!GetStringFromConfig(aSection,KScanInfo,iScanInfoName ))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KScanInfo);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- if (dataOk)
- {
- CWlanScanInfo* iScanInfo = static_cast<CWlanScanInfo*>(GetDataObjectL(iScanInfoName));
-
- // Check if a scan has been made
- if( iScanInfo != NULL )
- {
- const TUint8 KTemp80211SupRatesId = 1;
- const TUint8 KTemp80211SupRatesMaxLen = 18;
- // Scan info gives data as "information elements"
- TUint8 ieLen(0);
- const TUint8* ieData(0);
-
- TInt err = iScanInfo->InformationElement( KTemp80211SupRatesId, ieLen, &ieData );
-
- // Check supported rate if the information element was available
- if(err == KErrNone)
- {
- TBuf8<KTemp80211SupRatesMaxLen> supRates8;
- supRates8.Copy( ieData, ieLen );
- TBool supported = CheckSupportedRates( supRates8, aRate );
- if(!supported)
- {
- ERR_PRINTF2( _L("%d rate not supportedRates"), aRate );
- SetError(KErrNotSupported);
- }
- }
- else
- {
- ERR_PRINTF2( _L("err: [%d]"), err );
- SetError(err);
- }
- }
- else
- {
- ERR_PRINTF1(_L("Failed to get CWlanScanInfo object"));
- SetBlockResult(EFail);
- }
- }
-
- INFO_PRINTF1(_L("*END* CT_RSocketData::DoCmdCheckSupportedRates"));
- }
-
-/**
- * Review if the rate its supported.
- * @param aSupportedRates Rate to calculate and if match with the desired rate
- * @param aRate rate to verify if is supporrted, The rate to be checked in 0.5Mb/s units.
- * Ie. 2 = 2 * 0.5Mb/s = 1Mb/s.
- * @return Etrue if the rate is supported
- */
-TBool CT_RSocketData::CheckSupportedRates(const TDesC8& aSupportedRates, const TUint8 aRate)
- {
- // Supported rates information element format is the following:
- // | element id (1 octet) | length (1 octet) | supported rates (1-8 octets) |
- // where each octet of supported rates contains one supported rate in
- // units of 500 kb/s. The first bit of supported rates field is always 1
- // if the rate belongs to the BSSBasicRateSet, if the rate does not belong
- // to the BSSBasicRateSet the first bit is 0.
-
- // For example Supported rates information element with value
- // 0x01,0x02,0x82,0x84
- // would mean that BSSBasicRateSet rates 1Mb/s and 2Mb/s are supported
-
- TBool supported( EFalse );
-
- for ( TInt i( 0 ); i < aSupportedRates.Length(); i++ )
- {
- TUint8 rate = aSupportedRates[i] & KBasicRateMask;
- if( rate == aRate ) supported = ETrue;
- //INFO_PRINTF2( _L("speed rate [%d]"), rate);
- switch( rate )
- {
- case K80211Rate1Mbit:
- INFO_PRINTF1( _L("AP can support Speed Rate 1Mbit") );
- break;
- case K80211Rate2Mbit:
- INFO_PRINTF1( _L("AP can support Speed Rate 2Mbit") );
- break;
- case K80211Rate5Mbit:
- INFO_PRINTF1( _L("AP can support Speed Rate 5Mbit") );
- break;
- case K80211Rate11Mbit:
- INFO_PRINTF1( _L("AP can support Speed Rate 11Mbit") );
- break;
- case K80211Rate12Mbit:
- INFO_PRINTF1( _L("AP can support Speed Rate 12Mbit") );
- break;
- case K80211Rate18Mbit:
- INFO_PRINTF1( _L("AP can support Speed Rate 18Mbit") );
- break;
- case K80211Rate22Mbit:
- INFO_PRINTF1( _L("AP can support Speed Rate 22Mbit") );
- break;
- case K80211Rate24Mbit:
- INFO_PRINTF1( _L("AP can support Speed Rate 24Mbit") );
- break;
- case K80211Rate36Mbit:
- INFO_PRINTF1( _L("AP can support Speed Rate 36Mbit") );
- break;
- case K80211Rate48Mbit:
- INFO_PRINTF1( _L("AP can support Speed Rate 48Mbit") );
- break;
- case K80211Rate54Mbit:
- INFO_PRINTF1( _L("AP can support Speed Rate 54Mbit") );
- break;
-
- default:
- break;
- }
- }
-
- return supported;
- }
-
-/**
- * Shutdown the socket (RSocket::Shutdown).
- * @param aAsyncErrorIndex Command index for async calls to returns errors to
- * @return
- */
-void CT_RSocketData::DoCmdShutdown( const TInt aAsyncErrorIndex)
- {
- INFO_PRINTF1(_L("*START* CT_RSocketData::DoCmdShutdown"));
- INFO_PRINTF1(_L("Starting to shutdown Socket"));
- iSocket->Shutdown( RSocket::ENormal, iActCallShutDownSocket->iStatus);
- iActCallShutDownSocket->Activate(aAsyncErrorIndex);
- IncOutstanding();
- INFO_PRINTF1(_L("*END* CT_RSocketData::DoCmdShutdown"));
- }
-/**
- * Helper function calling from the destroyer.
- * @param
- * @return
- */
-void CT_RSocketData::Shutdown()
- {
- TInt err(KErrNone);
- TRequestStatus status;
- iSocket->Shutdown(RSocket::ENormal, status);
- User::WaitForRequest( status );
- err = status.Int();
- if( err != KErrNone )
- {
- ERR_PRINTF2( _L("CT_RSocketData::Shutdown(): error[%d]"), err);
- SetError(err);
- }
- }
-
-/**
- * Close de socket.
- * @param
- * @return
- */
-void CT_RSocketData::DoCmdClose()
- {
- INFO_PRINTF1(_L("*START* CT_RSocketData::DoCmdClose"));
- Close();
- INFO_PRINTF1(_L("*END* CT_RSocketData::DoCmdClose"));
- }
-/**
- * Helper function to close the socket.
- * @param
- * @return
- */
-void CT_RSocketData::Close()
- {
- iSocket->Close();
- iSocketOpened = EFalse;
- }
--- a/wlanapitest/wlanhaitest/wlan/src/T_RSocketServData.cpp Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,431 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-#include "t_rsocketservdata.h"
-#include <commdb.h>
-#include <wdbifwlansettings.h>
-#include <apselect.h>
-#include <aplistitem.h>
-#include <apdatahandler.h>
-#include <apaccesspointitem.h>
-/*@{*/
-//LIT's params fron the ini file
-_LIT(KWlanIap, "WLANIAP");
-_LIT(KWlanSsid, "DEFAULT_SSID");
-_LIT(KCommsDbTableView, "commsdbtableview");
-_LIT(KCommsDatabase, "commsdatabase");
-/*@}*/
-
-/*@{*/
-//LIT's commands
-_LIT(KCmdSetOutgoingIap, "SetOutgoingIap");
-_LIT(KCmdConnect, "Connect");
-_LIT(KCmdClose, "Close");
-/*@}*/
-
-
-/**
- * Two phase constructor
- *
- * @leave system wide error
- */
-CT_RSocketServData* CT_RSocketServData::NewL()
- {
- CT_RSocketServData * ret = new (ELeave) CT_RSocketServData();
- CleanupStack::PushL(ret);
- ret->ConstructL();
- CleanupStack::Pop(ret);
- return ret;
- }
-
-/*
- * public destructor
- */
-CT_RSocketServData::~CT_RSocketServData()
- {
- if(iSocketServConnected)
- {
- Close();
- }
- if(iSocketServ)
- {
- delete iSocketServ;
- iSocketServ = NULL;
- }
- }
-
-/**
- * Private constructor. First phase construction
- */
-CT_RSocketServData::CT_RSocketServData()
-: iSocketServ(NULL),
- iSocketServConnected(EFalse),
- iIapID(0)
- {
- }
-
-/**
- * Second phase construction
- *
- * @internalComponent
- *
- * @return N/A
- *
- * @pre None
- * @post None
- *
- * @leave system wide error
- */
-void CT_RSocketServData::ConstructL()
- {
- iSocketServ = new (ELeave)RSocketServ();
- }
-
-
-/**
- * Return a pointer to the object that the data wraps
- *
- * @return pointer to the object that the data wraps
- */
-TAny* CT_RSocketServData::GetObject()
- {
- return iSocketServ;
- }
-
-void CT_RSocketServData::SetIapID(TUint32 aIapID)
- {
- iIapID = aIapID;
- }
-
-/**
- * Process a command read from the Ini file
- * @param aCommand The command to process
- * @param aSection The section get from the *.ini file of the project T_Wlan
- * @param aAsyncErrorIndex Command index dor async calls to returns errors to
- * @return TBool ETrue if the command is process
- * @leave system wide error
- */
-TBool CT_RSocketServData::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt /*aAsyncErrorIndex*/)
- {
- TBool ret = ETrue;
-
- if(aCommand == KCmdSetOutgoingIap)
- {
- DoCmdSetOutgoingIap(aSection);
- }
- else if(aCommand == KCmdConnect)
- {
- DoCmdConnect();
- }
- else if(aCommand == KCmdClose)
- {
- DoCmdClose();
- }
- else
- {
- ERR_PRINTF1(_L("Unknown command."));
- ret = EFalse;
- }
- return ret;
- }
-
-
-/**
- * Get IAP, matching the name given (KWlanIap parameter read from the ini file). Set SSID of the
- * IAP to the given value (KWlanSsid parameter read from the ini file).
- * Store the ID of the IAP locally to allow using the IAP for connecting.
- * If there are errors, are management for SetBlockResult() and SetError()
- * @param aSection Section to review in the ini file for this command
- * @return void
- */
-void CT_RSocketServData::DoCmdSetOutgoingIap(const TTEFSectionName& aSection)
- {
- INFO_PRINTF1(_L("*START* CT_RSocketServData::DoCmdSetOutgoingIap"));
- TBool dataOk = ETrue;
-
- TPtrC aIapName;
- if(!GetStringFromConfig(aSection, KWlanIap, aIapName))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KWlanIap);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- TPtrC aSsid;
- if(!GetStringFromConfig(aSection, KWlanSsid, aSsid))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KWlanSsid);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- TPtrC commsdbtableName;
- if(!GetStringFromConfig(aSection, KCommsDbTableView, commsdbtableName))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"),&KCommsDbTableView);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- TPtrC commsdbName;
- if(!GetStringFromConfig(aSection, KCommsDatabase, commsdbName))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"),&KCommsDatabase);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- if (dataOk)
- {
- // reset IAP id
- SetIapID(0);
-
- TBool apFound = EFalse;
- // Open view to IAP table, select all outgoing IAPs.
- CCommsDbTableView* searchView = static_cast<CCommsDbTableView*>(GetDataObjectL(commsdbtableName));
- CCommsDatabase* commsDatabase = static_cast<CCommsDatabase*>(GetDataObjectL(commsdbName));
-
- // Make sure the view was available.
- if( searchView != NULL && commsDatabase != NULL )
- {
- CleanupStack::PushL(searchView);
- INFO_PRINTF1(_L("Start browsing through the IAPs."));
- TInt error = searchView->GotoFirstRecord();
-
- if( error == KErrNone )
- {
- // Buffer for reading IAP names from CommsDat. Buffer size is set to
- // maximum readable value from CommsDat.
- TBuf<KCommsDbSvrMaxColumnNameLength> iapName;
- TUint32 iapID = 0;
- INFO_PRINTF1(_L("CT_RSocketServData: CommsDat ready for searching, going through all outgoing IAPs"));
- TUint32 iapservice = 0;
-
- TBool failed = EFalse;
-
- // Go through all IAPs.
- while( error == KErrNone )
- {
- iapName.FillZ();
-
- // Read IAP ID and name from IAP table in CommsDat.
- TRAPD(err, searchView->ReadTextL( TPtrC( COMMDB_NAME ), iapName ));
-
- if(err == KErrNone)
- {
- TRAP(err, searchView->ReadUintL( TPtrC( COMMDB_ID ), iapID ));
-
- if(err == KErrNone)
- {
- INFO_PRINTF3(_L("CT_RSocketServData: IAP (ID = [%d]): %S"), iapID, &iapName );
-
- // Try to match the name with user input in the ini file.
- if( iapName.Match( aIapName ) == KErrNone )
- {
- INFO_PRINTF2(_L("CT_RSocketServData: Matching IAP name found with IAP ID = [%d]"), iapID );
-
- apFound = ETrue;
-
- // Return the found IAP ID
- SetIapID(iapID);
-
- // Read IAP service from IAP table in CommsDat.
- TRAPD(err, searchView->ReadUintL( TPtrC( IAP_SERVICE ), iapservice ));
-
- if(err == KErrNone)
- {
- INFO_PRINTF2(_L("Service of the AP: %d"),iapservice);
-
- // Write the ssid given as a parameter in WLANServiceTable in CommsDat
- INFO_PRINTF1(_L("CT_RSocketServData: Get WlanSettings from WLANServiceTable"));
- CWLanSettings* wlanset = new (ELeave) CWLanSettings();
- CleanupStack::PushL( wlanset );
-
- // Connect to CommsDat
- err = wlanset->Connect();
-
- if( err == KErrNone )
- {
- // Get wlan settings corresponding IAP service info from IAP table
- SWLANSettings wlanSettings;
- err = wlanset->GetWlanSettings( iapservice, wlanSettings );
-
- if( err == KErrNone )
- {
- INFO_PRINTF2(_L("CT_RSocketServData: CommsDat: wlanSettings.Name = %S"), &wlanSettings.Name );
- INFO_PRINTF2(_L("CT_RSocketServData: CommsDat: wlanSettings.SSID = %S"), &wlanSettings.SSID );
-
- // Set the new ssid from the ini file
- wlanSettings.SSID = aSsid;
- INFO_PRINTF2(_L("CT_RSocketServData: New value for wlanSettings.SSID = %S"), &wlanSettings.SSID );
-
- // Write the new settings in CommsDat
- err = wlanset->WriteWlanSettings(wlanSettings );
-
- if( err == KErrNone )
- {
- INFO_PRINTF1(_L("CT_RSocketServData: WlanSettings saved in CommsDat"));
- wlanset->Disconnect();
- CleanupStack::PopAndDestroy( wlanset );
- }
- else
- {
- ERR_PRINTF2(_L("CT_RSocketServData: WriteWlanSettings error: [%d]"), err );
- SetError(err);
- failed = ETrue;
- break;
- }
- }
- else
- {
- ERR_PRINTF2(_L("CT_RSocketServData: Get WlanSettings error: [%d]"), err );
- SetError(err);
- failed = ETrue;
- break;
- }
- }
- else
- {
- ERR_PRINTF2(_L("CT_RSocketServData: WLanSettings connect failed! [%d]"), err );
- SetError(err);
- failed = ETrue;
- break;
- }
- }
- else
- {
- ERR_PRINTF2(_L("searchView->ReadUintL left with error %d"), err);
- SetError(err);
- failed = ETrue;
- break;
- }
- }
-
- error = searchView->GotoNextRecord();
- if(error == KErrNotFound)
- {
- INFO_PRINTF2(_L("searchView->GotoNextRecord() not found [%d]"), error);
- INFO_PRINTF1(_L("No more records to look for"));
- }
- else if(error != KErrNone)
- {
- ERR_PRINTF2(_L("searchView->GotoNextRecord() Failed with error = %d"),error);
- SetError(err);
- failed = ETrue;
- break;
- }
- }
- else
- {
- ERR_PRINTF2(_L("searchView->ReadUintL left with error %d"), err);
- SetError(err);
- failed = ETrue;
- break;
- }
- }
- else
- {
- ERR_PRINTF2(_L("searchView->ReadTextL left with error %d"), err);
- SetError(err);
- failed = ETrue;
- break;
- }
- }
-
- CleanupStack::Pop( searchView );
-
- //if( !failed && GetIapID() == 0 )
- // {
- // ERR_PRINTF1(_L("No valid IAP found"));
- // SetBlockResult(EFail);
- // }
- }
- else
- {
- INFO_PRINTF2(_L("CT_RSocketServData: No IAPs found [%d]"), error );
- }
-
- if(apFound == EFalse)
- {
- CApAccessPointItem *wlan = CApAccessPointItem::NewLC();
- wlan->SetNamesL(aIapName);
- wlan->SetBearerTypeL(EApBearerTypeWLAN);
- wlan->WriteTextL(EApWlanNetworkName, aSsid);
- CApDataHandler *handler = CApDataHandler::NewLC(*commsDatabase);
- TUint32 apId = handler->CreateFromDataL(*wlan);
- INFO_PRINTF4(_L("Add new IAP ID: %d, name:%S, SSID: %S"), apId,&aIapName,&aSsid);
- SetIapID(apId);
- CleanupStack::PopAndDestroy(2);
- }
- }
- else
- {
- ERR_PRINTF1(_L("CT_RSocketServData: No IAPs found"));
- ERR_PRINTF1(_L("CommsDat, no view and database were available."));
- SetBlockResult(EFail);
- }
- }
-
- INFO_PRINTF1(_L("*END* CT_RSocketServData::DoCmdSetOutgoingIap"));
- }
-
-/**
- * Command to calls RSocketServ::Connect. The error is management for SetError() helper
- * @param
- * @return
- */
-void CT_RSocketServData::DoCmdConnect()
- {
- INFO_PRINTF1(_L("*START* CT_RSocketServData::DoCmdConnect"));
-
- TInt err = iSocketServ->Connect();
- if(err != KErrNone)
- {
- ERR_PRINTF1(_L("iSocketServ->Connect() Fail"));
- SetError(err);
- }
- else
- {
- iSocketServConnected = ETrue;
- }
-
- INFO_PRINTF1(_L("*END* CT_RSocketServData::DoCmdConnect"));
- }
-/**
- * Command to close RSocketServ instance
- * @param
- * @return
- */
-void CT_RSocketServData::DoCmdClose()
- {
- INFO_PRINTF1(_L("*START* CT_RSocketServData::DoCmdClose"));
- Close();
- INFO_PRINTF1(_L("*END* CT_RSocketServData::DoCmdClose"));
- }
-
-/**
- * Helper for the command DoCmdCloseSocketServ: RSocketServ::Close
- * @param
- * @return
- */
-void CT_RSocketServData::Close()
- {
- iSocketServ->Close();
- iSocketServConnected = EFalse;
- }
--- a/wlanapitest/wlanhaitest/wlan/src/T_WlanDriverServer.cpp Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-#include "t_wlandriverserver.h"
-#include "t_wlanmgmtclientdata.h"
-#include "t_wlanscaninfodata.h"
-#include "t_rsocketservdata.h"
-#include "t_ccommsdatabasedata.h"
-#include "t_ccommsdbtableviewdata.h"
-#include "t_rconnectiondata.h"
-#include "t_rfiledata.h"
-#include "t_rsocketdata.h"
-
-
-/*@{*/
-_LIT(KT_WlanMgmtClient, "WlanMgmtClient");
-_LIT(KT_WlanScanInfo, "WlanScanInfo");
-_LIT(KT_WlanSocketServ, "RSocketServ");
-_LIT(KT_CCommsDB, "CCommsDatabase");
-_LIT(KT_CCommsDBTable, "CCommsDbTableView");
-_LIT(KT_RConnection, "RConnection");
-_LIT(KT_RSocket, "RSocket");
-_LIT(KT_RFile, "RFile");
-/*@}*/
-
-
-/**
- *
- * Same code for Secure and non-secure variants
- * Called inside the MainL() function to create and start the
- * CTestServer derived server.
- * @return - Instance of the test server
- */
-CT_WlanDriverServer* CT_WlanDriverServer::NewL()
- {
- CT_WlanDriverServer* server = new (ELeave) CT_WlanDriverServer();
- CleanupStack::PushL(server);
- server->ConstructL();
- CleanupStack::Pop(server);
- return server;
- }
-
-/**
- * Secure variant
- * Much simpler, uses the new Rendezvous() call to sync with the client
- */
-LOCAL_C void MainL()
- {
-#if (defined __DATA_CAGING__)
- RProcess().DataCaging(RProcess::EDataCagingOn);
- RProcess().SecureApi(RProcess::ESecureApiOn);
-#endif
- CActiveScheduler* sched = NULL;
- sched = new(ELeave) CActiveScheduler;
- CActiveScheduler::Install(sched);
- CT_WlanDriverServer* server = NULL;
-
- // Create the CTestServer derived server
- TRAPD(err, server = CT_WlanDriverServer::NewL());
- if(!err)
- {
- // Sync with the client and enter the active scheduler
- RProcess::Rendezvous(KErrNone);
- sched->Start();
- }
-
- delete server;
- delete sched;
- }
-
-/**
- *
- * Secure variant only
- * Process entry point. Called by client using RProcess API
- * @return - Standard Epoc error code on process exit
- */
-GLDEF_C TInt E32Main()
- {
- __UHEAP_MARK;
- CTrapCleanup* cleanup = CTrapCleanup::New();
- if(cleanup == NULL)
- {
- return KErrNoMemory;
- }
-
-#if (defined TRAP_IGNORE)
- TRAP_IGNORE(MainL());
-#else
- TRAPD(err,MainL());
-#endif
-
- delete cleanup;
- __UHEAP_MARKEND;
- return KErrNone;
- }
-/*
- * Creates an instance of CDataWrapper that wraps a CT_WlanDriverData object
- * @return wrapper - a CDataWrapper instance that wraps the CT_WlanDriverData object
- */
-CDataWrapper* CT_WlanDriverServer::CT_WlanDriverBlock::CreateDataL(const TDesC& aData)
- {
- CDataWrapper* wrapper = NULL;
-
- if( KT_WlanMgmtClient() == aData )
- {
- wrapper = CT_WlanMgmtClientData::NewL();
- }
- else if(KT_WlanScanInfo() == aData)
- {
- wrapper = CT_WlanScanInfoData::NewL();
- }
- else if(KT_WlanSocketServ() == aData)
- {
- wrapper = CT_RSocketServData::NewL();
- }
- else if(KT_CCommsDB() == aData)
- {
- wrapper = CT_CCommsDatabaseData::NewL();
- }
- else if(KT_CCommsDBTable() == aData)
- {
- wrapper = CT_CCommsDbTableViewData::NewL();
- }
- else if(KT_RConnection() == aData)
- {
- wrapper = CT_RConnectionData::NewL();
- }
- else if(KT_RSocket() == aData)
- {
- wrapper = CT_RSocketData::NewL();
- }
- else if(KT_RFile() == aData)
- {
- wrapper = CT_RFileData::NewL();
- }
- return wrapper;
- }
--- a/wlanapitest/wlanhaitest/wlan/src/T_WlanMgmtClientData.cpp Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-
-
-#include "t_wlanmgmtclientdata.h"
-#include <wlanmgmtclient.h>
-#include <wdbifwlansettings.h>
-
-/*@{*/
-//LIT's for Constant
-_LIT(KScanInfo, "scaninfo");
-/*@}*/
-
-/*@{*/
-//LIT's for WlanMgmtClientData
-_LIT(KCmdInstantiateMgmtClient, "NewL");
-_LIT(KCmdGetScanResults, "GetScanResults");
-_LIT(KCmdDestructor, "~");
-/*@}*/
-
-
-/**
- * Two phase constructor
- *
- * @leave system wide error
- */
-CT_WlanMgmtClientData* CT_WlanMgmtClientData::NewL()
- {
- CT_WlanMgmtClientData* ret = new (ELeave) CT_WlanMgmtClientData();
- CleanupStack::PushL(ret);
- ret->ConstructL();
- CleanupStack::Pop(ret);
- return ret;
- }
-
-/**
- * Public destructor
- */
-CT_WlanMgmtClientData::~CT_WlanMgmtClientData()
- {
- DestroyData();
- }
-
-/**
- * Private constructor. First phase construction
- */
-CT_WlanMgmtClientData::CT_WlanMgmtClientData()
-: iData(NULL)
- {
- }
-
-/**
- * Second phase construction
- *
- * @internalComponent
- *
- * @return N/A
- *
- * @pre None
- * @post None
- *
- * @leave system wide error
- */
-void CT_WlanMgmtClientData::ConstructL()
- {
- }
-
-/**
- * Return a pointer to the object that the data wraps
- *
- * @return pointer to the object that the data wraps
- */
-TAny* CT_WlanMgmtClientData::GetObject()
- {
- return iData;
- }
-
-
-/**
-* Process a command read from the Ini file
-* @param aCommand The command to process
-* @param aSection The section get from the *.ini file of the project T_Wlan
-* @param aAsyncErrorIndex Command index dor async calls to returns errors to
-* @return TBool ETrue if the command is process
-* @leave system wide error
-*/
-TBool CT_WlanMgmtClientData::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt /*aAsyncErrorIndex*/)
- {
- TBool ret = ETrue;
- if(aCommand == KCmdInstantiateMgmtClient)
- {
- DoCmdNewL();
- }
- else if(aCommand == KCmdGetScanResults)
- {
- DoCmdGetScanResults(aSection);
- }
- else if(aCommand == KCmdDestructor)
- {
- DoCmdDestructor();
- }
- else
- {
- ERR_PRINTF1(_L("Unknown command."));
- ret = EFalse;
- }
- return ret;
- }
-
-
-/**
- * Creates an Instance of CWlanMgmtClient
- * @param
- * @return
- */
-void CT_WlanMgmtClientData::DoCmdNewL()
- {
- INFO_PRINTF1(_L("*START* CT_WlanMgmtClientData::DoCmdNewL"));
-
- DestroyData();
-
- TRAPD(err,iData = CWlanMgmtClient::NewL());
- if(err != KErrNone)
- {
- ERR_PRINTF2(_L("CWlanMgmtClient was not constructed, err=%d" ),err);
- SetError(err);
- }
-
- INFO_PRINTF1(_L("*END* CT_WlanMgmtClientData::DoCmdNewL"));
- }
-
-
-/**
- * Test getting Wlan scan info from Wlan management interface. Call
- * DoCmdNewL for instantiate the CWlanMgmtClient and DoCmdNewL of CWlanScanInfo first.
- * @param aSection Section to read from the ini file
- * @return
- */
-void CT_WlanMgmtClientData::DoCmdGetScanResults(const TTEFSectionName& aSection)
- {
- INFO_PRINTF1(_L("*START* CT_WlanMgmtClientData::DoCmdGetScanResults"));
- TBool dataOk = ETrue;
-
- TPtrC scanInfoName;
- if(!GetStringFromConfig(aSection, KScanInfo, scanInfoName))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KScanInfo);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- if (dataOk)
- {
- CWlanScanInfo* iScanInfo = static_cast<CWlanScanInfo*>(GetDataObjectL(scanInfoName));
- if ( iScanInfo != NULL )
- {
- TInt err = iData->GetScanResults( *iScanInfo ) ;
- if(err == KErrNone)
- {
- INFO_PRINTF2(_L("iScanInfo size [%d]"),iScanInfo->Size());
- }
- else
- {
- ERR_PRINTF2(_L("iData->GetScanResults( *iScanInfo ) Failed with error %d"), err);
- SetError(err);
- }
- }
- else
- {
- ERR_PRINTF1(_L("iScanInfo is NULL"));
- SetBlockResult(EFail);
- }
- }
-
- INFO_PRINTF1(_L("*END* CT_WlanMgmtClientData::DoCmdGetScanResults"));
- }
-
-/**
- * Destructor for CWlanMgmtClient
- * @param
- * @return
- */
-void CT_WlanMgmtClientData::DoCmdDestructor()
- {
- INFO_PRINTF1(_L("*START* CT_WlanMgmtClientData::DoCmdDestructor"));
- DestroyData();
- INFO_PRINTF1(_L("*END* CT_WlanMgmtClientData::DoCmdDestructor"));
- }
-
-/**
- * Destroy the object of CWlanMgmtClient, call made from DoCmdDestructor()
- * @param
- * @return
- */
-void CT_WlanMgmtClientData::DestroyData()
- {
- if(iData)
- {
- delete iData;
- iData = NULL;
- }
- }
--- a/wlanapitest/wlanhaitest/wlan/src/T_WlanScanInfoData.cpp Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,266 +0,0 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-#include "t_wlanscaninfodata.h"
-//class CWlanScanInfo
-#include <wlanmgmtclient.h>
-#include <e32cmn.h>
-
-/*@{*/
-//LITs from the ini
-_LIT(KSsidParam, "DEFAULT_SSID_Ssid");
-_LIT(KUid, "WlanScanUid");
-/*@}*/
-
-/*@{*/
-//LIT's for the commands
-_LIT(KCmdNewL, "NewL");
-_LIT(KCmdDestructor, "~");
-_LIT(KCmdInformationElement, "InformationElement");
-/*@}*/
-
-/**
- * Two phase constructor
- *
- * @leave system wide error
- */
-CT_WlanScanInfoData* CT_WlanScanInfoData::NewL()
- {
- CT_WlanScanInfoData* ret = new(ELeave) CT_WlanScanInfoData();
- CleanupStack::PushL(ret);
- ret->ConstructL();
- CleanupStack::Pop(ret);
- return ret;
- }
-
-/**
- * Public destructor
- */
-CT_WlanScanInfoData::~CT_WlanScanInfoData()
- {
- DestroyData();
- }
-
-/**
- * Private constructor. First phase construction
- */
-CT_WlanScanInfoData::CT_WlanScanInfoData()
-: iData(NULL),
- iScanInfoInstanceIdentifier(KNullUid)
- {
- }
-
-
-/**
- * Second phase construction
- *
- * @internalComponent
- *
- * @return N/A
- *
- * @pre None
- * @post None
- *
- * @leave system wide error
- */
-void CT_WlanScanInfoData::ConstructL()
- {
- }
-
-/**
- * Return a pointer to the object that the data wraps
- *
- * @return pointer to the object that the data wraps
- */
-TAny* CT_WlanScanInfoData::GetObject()
- {
- return iData;
- }
-
-
-/**
- * Process a command read from the Ini file
- * @param aCommand The command to process
- * @param aSection The section get from the *.ini file of the project T_Wlan
- * @param aAsyncErrorIndex Command index dor async calls to returns errors to
- * @return TBool ETrue if the command is process
- * @leave system wide error
- */
-TBool CT_WlanScanInfoData::DoCommandL(const TTEFFunction& aCommand, const TTEFSectionName& aSection, const TInt /*aAsyncErrorIndex*/)
- {
- TBool ret = ETrue;
-
- if(aCommand == KCmdNewL)
- {
- DoCmdNewL(aSection);
- }
- else if(aCommand == KCmdDestructor)
- {
- DoCmdDestructor();
- }
- else if(aCommand == KCmdInformationElement)
- {
- DoCmdInformationElement(aSection);
- }
- else
- {
- ret = EFalse;
- ERR_PRINTF1(_L("Unknown command"));
- }
-
- return ret;
- }
-
-
-/**
- * Create an instance of CWlanScanInfo
- * @param
- * @return
- */
-void CT_WlanScanInfoData::DoCmdNewL(const TTEFSectionName& aSection)
- {
- INFO_PRINTF1(_L("*START* CT_WlanScanInfoData::DoCmdNewL"));
- DestroyData();
-
- TBool dataOk = ETrue;
-
- TInt wsUid;
- if(!GetHexFromConfig(aSection, KUid, wsUid ))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KUid);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- if (dataOk)
- {
- const TUid WsUid = {wsUid};
- TAny* interface = NULL;
-
- TRAPD(err, interface = REComSession::CreateImplementationL( WsUid, iScanInfoInstanceIdentifier ));
- if(err == KErrNone)
- {
- iData = reinterpret_cast<CWlanScanInfo*>( interface );
-
- if(iData == NULL)
- {
- ERR_PRINTF1(_L("CT_WlanScanInfoData::DoCmdNewL() Fail"));
- SetBlockResult(EFail);
- }
- }
- else
- {
- ERR_PRINTF2(_L("Create Implementation left with error %d"), err);
- SetError(err);
- }
- }
-
- INFO_PRINTF1(_L("*END* CT_WlanScanInfoData::DoCmdNewL"));
- }
-
-/**
- * Destructor for CWlanScanInfo
- * @param
- * @return
- */
-void CT_WlanScanInfoData::DoCmdDestructor()
- {
- INFO_PRINTF1(_L("*START* CT_WlanScanInfoData::DoCmdDestructor"));
- DestroyData();
- INFO_PRINTF1(_L("*END* CT_WlanScanInfoData::DoCmdDestructor"));
- }
-
-/**
- * called from DoCmdDestructor for destroy the object CWlanScanInfo
- * @param
- * @return
- */
-void CT_WlanScanInfoData::DestroyData()
- {
- // Cannot use "delete" directly because we use a member variable as an
- // ECom instance identifier
- REComSession::DestroyedImplementation( iScanInfoInstanceIdentifier );
- iData = NULL;
- }
-/**
- * Review if the IAP given in the ini file match with some Wireless Local Area Network (SelectScanInfo).
- * @param aSection Section in the ini file for this command
- * @return
- */
-void CT_WlanScanInfoData::DoCmdInformationElement(const TTEFSectionName& aSection)
- {
- INFO_PRINTF1(_L("*START* CT_WlanScanInfoData::DoCmdInformationElement"));
- TBool dataOk = ETrue;
-
- TPtrC aSsid;
- if(!GetStringFromConfig(aSection,KSsidParam, aSsid))
- {
- ERR_PRINTF2(_L("Error in getting parameter %S from INI file"), &KSsidParam);
- SetBlockResult(EFail);
- dataOk = EFalse;
- }
-
- if(dataOk)
- {
- TInt err(KErrNone);
- // Scan info gives data as "information elements"
- TUint8 ieLen(0);
- const TUint8* ieData;
- TWlanSsid ssid8;
- TBuf<KWlanMaxSsidLength> ssid;
- TBool match = EFalse;
-
- INFO_PRINTF2(_L("SSID to be checked: %S"),&aSsid);
- for( iData->First(); !iData->IsDone(); iData->Next() )
- {
- INFO_PRINTF1(_L("found scan info"));
- err = KErrNotReady;
- // Information Element ID for SSID as specified in 802.11.
- const TUint8 KWlan802Dot11SsidIE(0);
- err = iData->InformationElement( KWlan802Dot11SsidIE, ieLen, &ieData );
- if(err != KErrNone)
- {
- ERR_PRINTF2(_L("CScanInfo::InformationElement err: [%d]"),err);
- SetError(err);
- break;
- }
- if(ieLen)
- {
- ssid8.Copy( ieData, ieLen );
- ssid.Copy( ssid8 );
- INFO_PRINTF2(_L("Current information element SSID: %S"),&ssid);
- // check if this is an expected SSID
- if( aSsid.Compare( ssid ) == 0 )
- {
- INFO_PRINTF1(_L("SSID match!"));
- match = ETrue;
- break;
- }
- }
- }
-
- if (err == KErrNone && !match)
- {
- ERR_PRINTF2(_L("Given SSID %S NOT FOUND!"),&aSsid);
- SetBlockResult(EFail);
- }
- }
-
- INFO_PRINTF1(_L("*END* CT_WlanScanInfoData::DoCmdInformationElement"));
- }
-
--- a/wlanapitest/wlanhaitest/wlan/testdata/devlon52/t_wlan.ini Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-[UID]
-Uid = 0x101f8f01;
-
-[driveC]
-mmc=c:
-
-[driveE]
-mmc=e:
--- a/wlanapitest/wlanhaitest/wlan/testdata/networking-wlan-validation-automated-connection.ini Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-[wmgmtcnt]
-name = wmgmtcnt
-
-[wlansinf]
-name = wlansinf
-
-[comsdb]
-name = comsdb
-
-[comsdbtblview]
-name = comsdbtblview
-
-[scktserv]
-name = scktserv
-
-[rcntion]
-name = rcntion
-
-[rsckt]
-name = rsckt
-
-[rfile]
-name = rfile
-
-[include]
-file1 = \nt\wlan\t_wlan.ini
-file2 = \nt\wlan\t_wlan_environment.ini
-
-
-[NETWORKING-Wlan-Connection-0001-0001-NewL_command02]
-WlanScanUid = {UID, Uid}
-
-[NETWORKING-Wlan-Connection-0001-0001-GetScanResults_command03]
-scaninfo = wlansinf
-
-[NETWORKING-Wlan-Connection-0001-0001-InformationElement_command04]
-DEFAULT_SSID_Ssid = {IAP,Iap}
-
-
-
-[NETWORKING-Wlan-Connection-0002-0001-NewL_command02]
-commsdb = comsdb
-
-[NETWORKING-Wlan-Connection-0002-0001-SetOutgoingIap_command03]
-WLANIAP = {IAP,Iap}
-DEFAULT_SSID = {IAP,Ssid}
-commsdbtableview = comsdbtblview
-commsdatabase = comsdb
-
-[NETWORKING-Wlan-Connection-0002-0001-Open_command07]
-socketserv = scktserv
-
-[NETWORKING-Wlan-Connection-0002-0001-Start_command08]
-socketserv = scktserv
-
-[NETWORKING-Wlan-Connection-0002-0001-Open_command09]
-socketserv = scktserv
-connection = rcntion
-
-[NETWORKING-Wlan-Connection-0002-0001-Connect_command10]
-Ip = {DownloadServer,Ip}
-Port = {DownloadServer,Port}
-
-
-
-[NETWORKING-Wlan-Connection-0003-0001-NewL_command02]
-WlanScanUid = {UID, Uid}
-
-[NETWORKING-Wlan-Connection-0003-0001-NewL_command04]
-commsdb = comsdb
-
-[NETWORKING-Wlan-Connection-0003-0001-GetScanResults_command05]
-scaninfo = wlansinf
-
-[NETWORKING-Wlan-Connection-0003-0001-InformationElement_command06]
-DEFAULT_SSID_Ssid = {IAP80211b,Iap}
-
-[NETWORKING-Wlan-Connection-0003-0001-CheckSupportedRates_command07]
-rate = 2
-scaninfo = wlansinf
-
-[NETWORKING-Wlan-Connection-0003-0001-CheckSupportedRates_command08]
-rate = 4
-scaninfo = wlansinf
-
-[NETWORKING-Wlan-Connection-0003-0001-CheckSupportedRates_command09]
-rate = 11
-scaninfo = wlansinf
-
-[NETWORKING-Wlan-Connection-0003-0001-CheckSupportedRates_command10]
-rate = 22
-scaninfo = wlansinf
-
-[NETWORKING-Wlan-Connection-0003-0001-CheckSupportedRates_command11]
-rate = 108
-scaninfo = wlansinf
-
-[NETWORKING-Wlan-Connection-0003-0001-SetOutgoingIap_command12]
-WLANIAP = {IAP,Iap}
-DEFAULT_SSID = {IAP80211b,Iap}
-commsdbtableview = comsdbtblview
-commsdatabase = comsdb
-
-[NETWORKING-Wlan-Connection-0003-0001-Open_command16]
-socketserv = scktserv
-
-[NETWORKING-Wlan-Connection-0003-0001-Start_command17]
-socketserv = scktserv
-
-[NETWORKING-Wlan-Connection-0003-0001-Open_command18]
-socketserv = scktserv
-connection = rcntion
-
-[NETWORKING-Wlan-Connection-0003-0001-Connect_command19]
-Ip = {DownloadServer,Ip}
-Port = {DownloadServer,Port}
-
-
-
-[NETWORKING-Wlan-Connection-0004-0001-NewL_command02]
-WlanScanUid = {UID, Uid}
-
-[NETWORKING-Wlan-Connection-0004-0001-NewL_command04]
-commsdb = comsdb
-
-[NETWORKING-Wlan-Connection-0004-0001-GetScanResults_command05]
-scaninfo = wlansinf
-
-[NETWORKING-Wlan-Connection-0004-0001-InformationElement_command06]
-DEFAULT_SSID_Ssid = {IAP80211g,Iap}
-
-[NETWORKING-Wlan-Connection-0004-0001-CheckSupportedRates_command07]
-rate = 2
-scaninfo = wlansinf
-
-[NETWORKING-Wlan-Connection-0004-0001-CheckSupportedRates_command08]
-rate = 4
-scaninfo = wlansinf
-
-[NETWORKING-Wlan-Connection-0004-0001-CheckSupportedRates_command09]
-rate = 11
-scaninfo = wlansinf
-
-[NETWORKING-Wlan-Connection-0004-0001-CheckSupportedRates_command10]
-rate = 22
-scaninfo = wlansinf
-
-[NETWORKING-Wlan-Connection-0004-0001-CheckSupportedRates_command11]
-rate = 108
-scaninfo = wlansinf
-
-[NETWORKING-Wlan-Connection-0004-0001-SetOutgoingIap_command12]
-WLANIAP = {IAP,Iap}
-DEFAULT_SSID = {IAP80211g,Iap}
-commsdbtableview = comsdbtblview
-commsdatabase = comsdb
-
-[NETWORKING-Wlan-Connection-0004-0001-Open_command16]
-socketserv = scktserv
-
-[NETWORKING-Wlan-Connection-0004-0001-Start_command17]
-socketserv = scktserv
-
-[NETWORKING-Wlan-Connection-0004-0001-Open_command18]
-socketserv = scktserv
-connection = rcntion
-
-[NETWORKING-Wlan-Connection-0004-0001-Connect_command19]
-Ip = {DownloadServer,Ip}
-Port ={DownloadServer,Port}
-
--- a/wlanapitest/wlanhaitest/wlan/testdata/networking-wlan-validation-automated-instantiate.ini Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-[wmgmtcnt]
-name = wmgmtcnt
-
-[wlansinf]
-name = wlansinf
-
-[comsdb]
-name = comsdb
-
-[comsdbtblview]
-name = comsdbtblview
-
-[scktserv]
-name = scktserv
-
-[rcntion]
-name = rcntion
-
-[rsckt]
-name = rsckt
-
-[rfile]
-name = rfile
-
-[include]
-file1 = \nt\wlan\t_wlan.ini
-file2 = \nt\wlan\t_wlan_environment.ini
-
-
-[NETWORKING-Wlan-Instantiate-0001-0001-NewL_command01]
-WlanScanUid = {UID, Uid}
-
-
-
--- a/wlanapitest/wlanhaitest/wlan/testdata/networking-wlan-validation-automated-transfer.ini Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-[wmgmtcnt]
-name = wmgmtcnt
-
-[wlansinf]
-name = wlansinf
-
-[comsdb]
-name = comsdb
-
-[comsdbtblview]
-name = comsdbtblview
-
-[scktserv]
-name = scktserv
-
-[rcntion]
-name = rcntion
-
-[rsckt]
-name = rsckt
-
-[rfile]
-name = rfile
-
-[include]
-file1 = \nt\wlan\t_wlan.ini
-file2 = \nt\wlan\t_wlan_environment.ini
-
-
-[NETWORKING-Wlan-Transfer-0001-0001-NewL_command02]
-commsdb = comsdb
-
-[NETWORKING-Wlan-Transfer-0001-0001-SetOutgoingIap_command03]
-WLANIAP = {IAP,Iap}
-DEFAULT_SSID = {IAP,Ssid}
-commsdbtableview = comsdbtblview
-commsdatabase = comsdb
-
-[NETWORKING-Wlan-Transfer-0001-0001-Open_command07]
-socketserv = scktserv
-
-[NETWORKING-Wlan-Transfer-0001-0001-Start_command08]
-socketserv = scktserv
-
-[NETWORKING-Wlan-Transfer-0001-0001-Open_command09]
-socketserv = scktserv
-connection = rcntion
-
-[NETWORKING-Wlan-Transfer-0001-0001-Connect_command10]
-Ip = {DownloadServer,Ip}
-Port = {DownloadServer,Port}
-
-[NETWORKING-Wlan-Transfer-0001-0001-DownloadSendHTTPGet_command11]
-Host = {DownloadServer,Ip}
-File = /nokia/0100k.bin
-
-[NETWORKING-Wlan-Transfer-0001-0001-RecvOneOrMore_command12]
-Save = {driveC,mmc}\0100k.bin
-
-
-
-[NETWORKING-Wlan-Transfer-0002-0001-NewL_command02]
-commsdb = comsdb
-
-[NETWORKING-Wlan-Transfer-0002-0001-SetOutgoingIap_command03]
-WLANIAP = {IAP,Iap}
-DEFAULT_SSID = {IAP,Ssid}
-commsdbtableview = comsdbtblview
-commsdatabase = comsdb
-
-[NETWORKING-Wlan-Transfer-0002-0001-Open_command07]
-socketserv = scktserv
-
-[NETWORKING-Wlan-Transfer-0002-0001-Start_command08]
-socketserv = scktserv
-
-[NETWORKING-Wlan-Transfer-0002-0001-Open_command09]
-socketserv = scktserv
-connection = rcntion
-
-[NETWORKING-Wlan-Transfer-0002-0001-Connect_command10]
-Ip = {DownloadServer,Ip}
-Port ={DownloadServer,Port}
-
-[NETWORKING-Wlan-Transfer-0002-0001-DownloadSendHTTPGet_command11]
-Host = {DownloadServer,Ip}
-File = /nokia/0010k.bin
-
-[NETWORKING-Wlan-Transfer-0002-0001-RecvOneOrMore_command12]
-Save = {driveE,mmc}\0010k.bin
-
-
-
-[NETWORKING-Wlan-Transfer-0003-0001-NewL_command02]
-commsdb = comsdb
-
-[NETWORKING-Wlan-Transfer-0003-0001-SetOutgoingIap_command03]
-WLANIAP = {IAP,Iap}
-DEFAULT_SSID = {IAP,Ssid}
-commsdbtableview = comsdbtblview
-commsdatabase = comsdb
-
-[NETWORKING-Wlan-Transfer-0003-0001-Open_command07]
-socketserv = scktserv
-
-[NETWORKING-Wlan-Transfer-0003-0001-Start_command08]
-socketserv = scktserv
-
-[NETWORKING-Wlan-Transfer-0003-0001-Open_command09]
-socketserv = scktserv
-connection = rcntion
-
-[NETWORKING-Wlan-Transfer-0003-0001-Connect_command10]
-Ip = {DownloadServer,Ip}
-Port = {DownloadServer,Port}
-
-[NETWORKING-Wlan-Transfer-0003-0001-DownloadSendHTTPGet_command11]
-Host = {DownloadServer,Ip}
-File = /nokia/10MB.bin
-
-[NETWORKING-Wlan-Transfer-0003-0001-RecvOneOrMore_command12]
-Save = {driveC,mmc}\10MB.bin
-
-
-
-[NETWORKING-Wlan-Transfer-0004-0001-NewL_command02]
-commsdb = comsdb
-
-[NETWORKING-Wlan-Transfer-0004-0001-GenerateFile_command03]
-File = {driveC,mmc}\10mb2.bin
-Size = 10485760
-
-[NETWORKING-Wlan-Transfer-0004-0001-SetOutgoingIap_command04]
-WLANIAP = {IAP,Iap}
-DEFAULT_SSID = {IAP,Ssid}
-commsdbtableview = comsdbtblview
-commsdatabase = comsdb
-
-[NETWORKING-Wlan-Transfer-0004-0001-Open_command08]
-socketserv = scktserv
-
-[NETWORKING-Wlan-Transfer-0004-0001-Start_command09]
-socketserv = scktserv
-
-[NETWORKING-Wlan-Transfer-0004-0001-Open_command10]
-socketserv = scktserv
-connection = rcntion
-
-[NETWORKING-Wlan-Transfer-0004-0001-Connect_command11]
-Ip = {UploadServer,Ip}
-Port = {UploadServer,Port}
-
-[NETWORKING-Wlan-Transfer-0004-0001-UploadSendHTTPPost_command12]
-File = {driveC,mmc}\10mb2.bin
-FileServer = 10mb2.bin
-clientID = SALT
-serverScript = /dy/upload/upfile.php
-
-[NETWORKING-Wlan-Transfer-0004-0001-RecvOneOrMore_command13]
-Save = KNullDesC
-
--- a/wlanapitest/wlanhaitest/wlan/testdata/t_wlan_environment.ini Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-[DownloadServer]
-Ip = 200.78.210.108
-Port = 80
-Host = 200.78.210.108
-
-[UploadServer]
-Ip = 217.30.188.169
-Port = 80
-
-[IAP]
-Iap = nokia
-Ssid = nokia
-
-[IAP80211g]
-Iap = nokia
-
-[IAP80211b]
-Iap = nokia
--- a/wlanapitest/wlanhaitest/wlan/testdata/tube/t_wlan.ini Thu May 27 14:33:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-[UID]
-Uid = 0x101f8f01;
-
-[driveC]
-mmc=c:
-
-[driveE]
-mmc=e: