[w-meter-svn] SF.net SVN: w-meter:[249] frame_injection_g/trunk/src

[<sat...@us...>]

Revision: 249
          http://w-meter.svn.sourceforge.net/w-meter/?rev=249&view=rev
Author:   sathakselva
Date:     2010-03-29 15:24:59 +0000 (Mon, 29 Mar 2010)

Log Message:
-----------
Pointer for a ICMP packet initialized

Modified Paths:
--------------
    frame_injection_g/trunk/src/data_dataframe_cpp.cpp
    frame_injection_g/trunk/src/data_qos_data_cpp.cpp

Modified: frame_injection_g/trunk/src/data_dataframe_cpp.cpp
===================================================================
--- frame_injection_g/trunk/src/data_dataframe_cpp.cpp	2010-03-29 15:06:52 UTC (rev 248)
+++ frame_injection_g/trunk/src/data_dataframe_cpp.cpp	2010-03-29 15:24:59 UTC (rev 249)
@@ -408,32 +408,34 @@
                                                     frame += sizeof (ip_hdr);
 
                                                     unsigned char *icmp_packet;
-													int icmp_hdr_len = sizeof (icmp_hdr);
-													int icmp_len = msdu_size + icmp_hdr_len;
+                                                    int icmp_hdr_len = sizeof (icmp_hdr);
+                                                    int icmp_len = msdu_size + icmp_hdr_len;
 
-                                                    icmp_packet = (unsigned char*) malloc (sizeof (unsigned char) * icmp_len );
+                                                    icmp_packet = (unsigned char*) malloc (sizeof (unsigned char) * icmp_len);
                                                     if (icmp_packet == NULL)
                                                     {
                                                         printf ("Unable to allocate memory...\n");
                                                         exit (1);
                                                     }
-
+                                                    memset (icmp_packet, 0, icmp_len);
                                                     memcpy (icmp_packet, &icmp_hdr, sizeof (icmp_hdr));
 
                                                     if (radiobutton_user_defined->isChecked() == 1)
-                                                        memcpy (icmp_packet+icmp_hdr_len, str_payload, msdu_size);
+                                                        memcpy (icmp_packet + icmp_hdr_len, str_payload, msdu_size);
                                                     else
                                                     {
                                                         unsigned char icmp_payload[msdu_size];
                                                         memset (icmp_payload, 'a', msdu_size);
-                                                        memcpy (icmp_packet+icmp_hdr_len, &icmp_payload, msdu_size);
+                                                        memcpy (icmp_packet + icmp_hdr_len, &icmp_payload, msdu_size);
                                                     }
-													int offset = 2;
+
+                                                    int offset = 2;
                                                     unsigned short icmp_checksum = ip_check_sum (icmp_packet, icmp_len);
-													icmp_checksum = htons (icmp_checksum);
-                                                    printf ("Checksum : %d\n", icmp_checksum);
-													for (i = 0;i < 2;i++)
-														icmp_packet[offset + i] = * ( ( (unsigned char*) & icmp_checksum) + i);
+
+                                                    icmp_checksum = htons (icmp_checksum);
+                                                    for (i = 0;i < 2;i++)
+                                                        icmp_packet[offset + i] = * ( ( (unsigned char*) & icmp_checksum) + i);
+
                                                     memcpy (frame, icmp_packet, icmp_len);
                                                     frame += icmp_len;
                                                     frame_len = frame - &msg[0];

Modified: frame_injection_g/trunk/src/data_qos_data_cpp.cpp
===================================================================
--- frame_injection_g/trunk/src/data_qos_data_cpp.cpp	2010-03-29 15:06:52 UTC (rev 248)
+++ frame_injection_g/trunk/src/data_qos_data_cpp.cpp	2010-03-29 15:24:59 UTC (rev 249)
@@ -338,7 +338,7 @@
 
                                         //type conversion int to char - TXOP
                                         unsigned char temp_txop_char[2];
-                                        temp_txop_char[0] = * ( (char*) & temp_txop);
+                                        temp_txop_char[0] = * ( ( unsigned char*) & temp_txop);
 
                                         //Payload field value to local variable
                                         int temp_payload_size = lineedit_payload->text().length();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.