Mostly style fixes

Author: Artiom N.

src/book01/ch04/cpp/ping/ping.h

@@ -104,12 +104,13 @@ class PingPacket
 
 public:
     // Zero packet constructor. Need for recv.
-    explicit PingPacket(size_t packet_size = ping_packet_size) : data_buffer_(packet_size, 0)
+    // cppcheck-suppress noExplicitConstructor
+    PingPacket(size_t packet_size = ping_packet_size) : data_buffer_(packet_size, 0)  // NOLINT
     {
         assert(data_buffer_.size() >= sizeof(icmphdr));
     }
 
-    explicit PingPacket(uint16_t packet_id, uint16_t packet_sequence_number, size_t packet_size = ping_packet_size)
+    PingPacket(uint16_t packet_id, uint16_t packet_sequence_number, size_t packet_size = ping_packet_size)
     {
         create_new_packet(packet_id, packet_sequence_number, packet_size);
     }
@@ -119,7 +120,7 @@ class PingPacket
         assert(data_buffer_.size() >= sizeof(icmphdr));
     }
 
-    explicit PingPacket(const BufferType::const_iterator &start, const BufferType::const_iterator &end)
+    PingPacket(const BufferType::const_iterator &start, const BufferType::const_iterator &end)
         : data_buffer_{start, end}
     {
         assert(data_buffer_.size() >= sizeof(icmphdr));

src/book01/ch11/cpp/sockdiag/sock_diag.cpp

@@ -73,7 +73,7 @@ void print_diag(const inet_diag_msg *diag, unsigned int len)
         throw std::system_error(errno, std::generic_category(), "short response");
     }
 
-    if (diag->idiag_family != AF_INET && diag->idiag_family != AF_INET6)
+    if (AF_INET != diag->idiag_family && AF_INET6 != diag->idiag_family)
     {
         throw std::logic_error("unexpected protocol family");
     }
@@ -219,7 +219,7 @@ void print_responses(int fd)
                 }
             }
 
-            if (h->nlmsg_type != SOCK_DIAG_BY_FAMILY)
+            if (SOCK_DIAG_BY_FAMILY != h->nlmsg_type)
             {
                 throw std::system_error(errno, std::generic_category(), "unexpected nlmsg_type");
             }

src/book01/ch17/cpp/mailslot/client.cpp

@@ -9,7 +9,7 @@ extern "C"
 
 int main()
 {
-    const LPCTSTR slot_name = TEXT("\\\\.\\mailslot\\test_mailslot");
+    const LPCTSTR slot_name = TEXT(R"(\\.\mailslot\test_mailslot)");
     HANDLE h_slot =
         CreateFile(slot_name, GENERIC_WRITE, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 

src/book01/ch22/cpp/pcap_sniffer/packet_printer.cpp

@@ -4,6 +4,13 @@
 #include <iostream>
 #include <string>
 
+#if !defined(ETHERTYPE_IP)
+constexpr auto ETHERTYPE_IP = 0x0800;
+#endif
+
+#if !defined(ETHERTYPE_IPV6)
+constexpr auto ETHERTYPE_IPV6 = 0x86DD;
+#endif
 
 // Ethernet headers are always exactly 14 bytes.
 constexpr auto SIZE_ETHERNET = 14;
@@ -219,7 +226,7 @@ void PacketPrinter::got_packet(u_char *args, const pcap_pkthdr *header, const u_
 
     switch (ntohs(ethernet->ether_type))
     {
-        case 0x0800:
+        case ETHERTYPE_IP:
         {
             std::cout << "  IPv4 protocol" << std::endl;
             proto_addr.resize(INET_ADDRSTRLEN);
@@ -241,7 +248,7 @@ void PacketPrinter::got_packet(u_char *args, const pcap_pkthdr *header, const u_
             dst = &ip->ip_dst;
             break;
         }
-        case 0x86DD:
+        case ETHERTYPE_IPV6:
         {
             std::cout << "  IPv6 protocol" << std::endl;
             proto_addr.resize(INET6_ADDRSTRLEN);

src/book01/ch23/cpp/tun_example/main.cpp

@@ -25,7 +25,7 @@ extern "C"
 #include <string>
 
 
-int perform_ioctl(int fd, const int call_id, void *result, const std::string &msg)
+int perform_ioctl(int fd, int call_id, void *result, const std::string &msg)
 {
     const auto ioctl_res = ioctl(fd, call_id, result);
     if (-1 == ioctl_res)

src/book02/ch01/python/client-to-client.py

@@ -27,8 +27,7 @@
             continue
 
     while True:
-        data = f'I\'am {sock.getsockname()} ' \
-               f'sending data to ' f'{sock.getpeername()}'
+        data = f'I\'am {sock.getsockname()} sending data to {sock.getpeername()}'
         print(f'Sending "{data}"')
         sock.send(data.encode())
         print('Receiving...')

src/book02/ch03/python/mt_server/mt-file-server1.py

@@ -120,6 +120,7 @@ def send_file_to_the_client(c_sock: socket.socket):
     except BaseException as e:
         print(e)
         result = False
+
     c_sock.close()
     print(f'Client with tid = {current_thread().name} [{current_thread().native_id}] exiting...')
     return result