diff --git a/README.md b/README.md index e36f2884e..43d675fc0 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,13 @@ ## Project Hiatus -Due to the overwhelming support for translations, Linux Journey is in the middle of a site overhaul to make it more scalable for translations. Unfortunately, I am a full time professional and full time student so it has taken longer to do the migration than I had hoped. For now, any additional translations/edits/additions will not be added to the site. I'll try my best to finish adding everything that was already committed and will re-visit the project when I have more cycles. Thank you for understanding. +> Due to the overwhelming support for translations, Linux Journey is in the middle of a site overhaul to make it more scalable for translations. Unfortunately, I am a full time professional and full time student so it has taken longer to do the migration than I had hoped. For now, any additional translations/edits/additions will not be added to the site. I'll try my best to finish adding everything that was already committed and will re-visit the project when I have more cycles. Thank you for understanding. +> +> - [@cindyq](https://github.com/cindyq) + +I've created this fork for maintenance of the project. You guys can make contributions to that, and, if [@cindyq](https://github.com/cindyq) ever back, we can just merge. Otherwise, we can keep continuing this awesome project + +If you have any translation, any dead pull request here, any suggestion, etc. Just open an issue in a PR in the fork. ## Language Support diff --git a/lessons/locales/en_english/network-troubleshooting/icmp.md b/lessons/locales/en_english/network-troubleshooting/icmp.md index 21113677b..48f171fbf 100644 --- a/lessons/locales/en_english/network-troubleshooting/icmp.md +++ b/lessons/locales/en_english/network-troubleshooting/icmp.md @@ -2,7 +2,7 @@ ## Lesson Content -The Internet Control Message Protocol (ICMP) is part of the TCP/IP protocol suite, it used to send updates and error messages and is an extremely useful protocol used for debugging network issues such as a failed packet delivery. +The Internet Control Message Protocol (ICMP) is part of the TCP/IP protocol suite, it is used to send updates and error messages and is an extremely useful protocol used for debugging network issues such as a failed packet delivery. Each ICMP message contains a type, code and checksum field. The type field is the type of ICMP message, the code is a sub-type and describes more information about the message and the checksum is used to detect any issues with the integrity of the message. @@ -15,7 +15,7 @@ Let's look at some common ICMP Types:
ftp 21/tcp ssh 22/tcp -smtp 25/tcp +smtp 25/tcp domain 53/tcp # DNS http 80/tcp https 443/tcp @@ -22,23 +22,23 @@ The first column is the name of the service, then the port number and the transp netstat -An extremely useful tool to get detailed information about your network is netstat. Netstat displays various network related information such network connections, routing tables, information about network interfaces and more, it's the swiss army knife of networking tools. We will focus mostly on one feature netstat has and that's the status of network connections. Before we look at an example, let's talk about sockets and ports first. A socket is an interface that allows programs to send and receive data while a port is used to identify which application should send or receive data. The socket address is the combination of the IP address and port. Every connection between a host and destination requires a unique socket. For example, HTTP is a service that runs on port 80, however we can have many HTTP connections and to maintain each connection a socket gets created per connection. +An extremely useful tool to get detailed information about your network is netstat. Netstat displays various network related information such as network connections, routing tables, information about network interfaces and more, it's the swiss army knife of networking tools. We will focus mostly on one feature netstat has and that's the status of network connections. Before we look at an example, let's talk about sockets and ports first. A socket is an interface that allows programs to send and receive data while a port is used to identify which application should send or receive data. The socket address is the combination of the IP address and port. Every connection between a host and destination requires a unique socket. For example, HTTP is a service that runs on port 80, however we can have many HTTP connections and to maintain each connection a socket gets created per connection.-You'll notice a lot of stuff happening when you run a packet capture, well that's to be expected there's a lot of network activity happening in the background. In my above example, I've taken only a snippet of my capture specifically the time when I decided to ping www.google.com. +You'll notice a lot of stuff happening when you run a packet capture, well that's to be expected there's a lot of network activity happening in the background. In my above example, I've taken only a snippet of my capture specifically the time when I decided to ping www.google.com. Understanding the output @@ -41,7 +41,7 @@ You'll notice a lot of stuff happening when you run a packet capture, well that'pete@icebox:~$ netstat -at Active Internet connections (servers and established) -Proto Recv-Q Send-Q Local Address Foreign Address State -tcp 0 0 icebox:domain *:* LISTEN -tcp 0 0 localhost:ipp *:* LISTEN -tcp 0 0 icebox.lan:44468 124.28.28.50:http TIME_WAIT -tcp 0 0 icebox.lan:34751 124.28.29.50:http TIME_WAIT -tcp 0 0 icebox.lan:34604 economy.canonical.:http TIME_WAIT -tcp6 0 0 ip6-localhost:ipp [::]:* LISTEN -tcp6 1 0 ip6-localhost:35094 ip6-localhost:ipp CLOSE_WAIT +Proto Recv-Q Send-Q Local Address Foreign Address State +tcp 0 0 icebox:domain *:* LISTEN +tcp 0 0 localhost:ipp *:* LISTEN +tcp 0 0 icebox.lan:44468 124.28.28.50:http TIME_WAIT +tcp 0 0 icebox.lan:34751 124.28.29.50:http TIME_WAIT +tcp 0 0 icebox.lan:34604 economy.canonical.:http TIME_WAIT +tcp6 0 0 ip6-localhost:ipp [::]:* LISTEN +tcp6 1 0 ip6-localhost:35094 ip6-localhost:ipp CLOSE_WAIT tcp6 0 0 ip6-localhost:ipp ip6-localhost:35094 FIN_WAIT2-The netstat -a command shows the listening and non-listening sockets for network connections, the -t flag shows only tcp connections. +The netstat -a command shows the listening and non-listening sockets for network connections, the -t flag shows only tcp connections. The columns are as follows from left to right: @@ -71,4 +71,4 @@ What port is used for HTTPS? ## Quiz Answer -443 \ No newline at end of file +443 diff --git a/lessons/locales/en_english/network-troubleshooting/packet-analysis.md b/lessons/locales/en_english/network-troubleshooting/packet-analysis.md index 8fe822236..fc24f5d0d 100644 --- a/lessons/locales/en_english/network-troubleshooting/packet-analysis.md +++ b/lessons/locales/en_english/network-troubleshooting/packet-analysis.md @@ -28,7 +28,7 @@ listening on wlan0, link-type EN10MB (Ethernet), capture size 65535 bytes 11:28:31.190665 IP ThePickleParty.lan.51056 > 192.168.86.255.rfe: UDP, length 306