README-en.md edited online with Bitbucket

README-en.md

@@ -79,7 +79,7 @@ In this laboratory experience you will complete a simple packet sniffer that cap
 
 ## Laboratory session:
 
-The application that you will complete today allows the users to analyze network traffic and to monitor the images that are being tranfered through the net.
+The application that you will complete today allows the users to analyze network traffic and monitor the images that are being tranfered through the net.
 
 Figure 2 shows an image of the application interface. Each row in the table is the information of each captured packet. The text box under the table presents a ASCII summary of a selected packet from the table. The list in the right presents the images that have been captured by the sniffer.  
 
@@ -95,6 +95,7 @@ To create a packet sniffer you can use the *pcap* library that provides an inter
 
 The task of the sniffer programmer to decode the raw stream into human readable information.  Fortunately this is not your task, but you can learn how to do it, if you want, by reading the source code of this laboratory.  Your task is to follow the exercises below so you provide the packet sniffer with the needed objects (Classes) to process the packets.
 
+
 ### Exercise 1 - Familiarize yourself with the application
 
 #### Instructions:
@@ -107,59 +108,60 @@ The task of the sniffer programmer to decode the raw stream into human readable
 2. Configure the project.  The project consists of several files.  In this laboratory experience you will be working with the files `ethernet_hdr.h`, `ethernet_packet.h`, `ethernet_packet.cpp`, `ip_packet.h` and `ip_packet.cpp`.
 
 
-### Exercise 2: Complete the class ethernet_packet
+### Exercise 2 - Complete the class ethernet_packet
 
-Study the file `ethernet_hdr.h`. This file contains the definition of the data structure that represents an Ethernet header.:
+1. Study the file `ethernet_hdr.h`. This file contains the definition of the data structure that represents an Ethernet header.:
 
-```
-#define ETHER_ADDR_LEN 6
+    ```
+    #define ETHER_ADDR_LEN 6
 
-struct sniff_ethernet {
+    struct sniff_ethernet {
         u_char  ether_dhost[ETHER_ADDR_LEN];    /* destination host address */
         u_char  ether_shost[ETHER_ADDR_LEN];    /* source host address */
         u_short ether_type;                     /* IP? ARP? RARP? etc */
-};
-```
+    };
+    ```
 
-The Ethernet header above is used to decode the ethernet part of the raw data in each packet.  It is composed of the source MAC address (ether_shost, 6 bytes), the destiantion MAC address (ether_dhost, 6 bytes), and the type of Ethernet packet (ether_type, 2 bytes) which is used to determine if the packet is an IP packet.
+    The Ethernet header above is used to decode the ethernet part of the raw data in each packet.  It is composed of the source MAC address (ether_shost, 6 bytes), the destiantion MAC address (ether_dhost, 6 bytes), and the type of Ethernet packet (ether_type, 2 bytes) which is used to determine if the packet is an IP packet.
 
-As you know, it is not a good idea to show this information format to a regular user.  Your first task is to define the functions of the C++ class that defines the functions to translate the MAC address information into human readable strings.
+    As you know, it is not a good idea to show this information format to a regular user.  Your first task is to define the functions of the C++ class that defines the functions to translate the MAC address information into human readable strings.
 
-The following code is the definition of the class `ethernet_packet`, that can be found in file `ethernet_packet.h`:
+2. The following code is the definition of the class `ethernet_packet`, that can be found in file `ethernet_packet.h`:
 
-```
-class ethernet_packet
-{
+    ```
+    class ethernet_packet
+    {
 
-    sniff_ethernet ethernet ;
-    // Returns a 6 bytes MAC address in string representation.
-    string mac2string(u_char []) ;
+        sniff_ethernet ethernet ;
+        // Returns a 6 bytes MAC address in string representation.
+        string mac2string(u_char []) ;
 
-public:
-    ethernet_packet();  // Default constructor
+    public:
+        ethernet_packet();  // Default constructor
 
-    // Set the ethernet variable member ether_dhost to the values
-    // received in the array
-    void setEtherDHost(u_char []) ;
-    // Same as above but to the ether_shost
-    void setEtherSHost(u_char []) ;
+        // Set the ethernet variable member ether_dhost to the values
+        // received in the array
+        void setEtherDHost(u_char []) ;
+        
+        // Same as above but to the ether_shost
+        void setEtherSHost(u_char []) ;
 
-    // Set the ethernet type to the value received.
-    void setEtherType(u_short) ;
+        // Set the ethernet type to the value received.
+        void setEtherType(u_short) ;
 
-    // returns the string representation of the ethernet addresses
-    string getEtherDHost() ;
-    string getEtherSHost() ;
+        // returns the string representation of the ethernet addresses
+        string getEtherDHost() ;
+        string getEtherSHost() ;
 
-    // Return the ethernet type
-    u_short getEtherType() ;
+        // Return the ethernet type
+        u_short getEtherType() ;
 
-};
-```
+    };
+    ```
 
-Note that each object of the class `ethernet_packet` only has one attribute: a structure of type `sniff_ethernet` named `ethernet`
+    Note that each object of the class `ethernet_packet` only has one attribute: a structure of type `sniff_ethernet` named `ethernet`
 
-The rest are methods that act as interface to the attribute:
+3. The rest are methods that act as interface to the attribute:
 
     * `void setEtherDHost(u_char [])`: is a *setter* to the field `ether_dhost` of the attribute `ethernet`
     * `void setEtherSHost(u_char [])`: is a *setter* to the field `ether_shost` of the attribute `ethernet`
@@ -168,9 +170,9 @@ The rest are methods that act as interface to the attribute:
     * `getEtherType()` is a *getter*  that returns the value of `ether_type` as *unsigned char*.
     * the private method `string mac2string(u_char [])` receives an array of six *unsigned characters* and returns the corresponding string to its hexadecimal representation. For example, if it receives `{ 0x8A, 0x11, 0xAB, 0xFF, 0x12, 0x34}` it must return the string `"8A:11:AB:FF:12:34"`.
 
-Your task in this exercise is to implement the seven functions listed above in the file `ethetnet_packet.cpp`.  The headers of some of the functions are provided in the file.
+4. Your task in this exercise is to implement the seven functions listed above in the file `ethetnet_packet.cpp`.  The headers of some of the functions are provided in the file.
 
-## Exercise 3: Construct the header of class ip_packet  
+### Exercise 3 - Construct the header of class ip_packet  
 
 Study the definitions of the functions of the class `ip_packet` found in file `ip_packet.cpp`
 
@@ -187,10 +189,14 @@ In the declaration of the class `ip_packet` you must especify that it is a **der
 
 ---
 
-### Deliverables
+## Deliverables
+
+1. Use "Deliverables" in Moodle to upload the file `ethernet_packet.cpp` and `ip_packet.h` that you defined.
 
-Use "Deliverables" in Moodle to upload the files `ethernet_packet.cpp` y `ip_packet.h` that you defined.
+---
+
+---
 
-### References
+## References
 
 [1]http://en.wikipedia.org/wiki/Packet_analyzer