6 files changed, 113 insertions, 5 deletions

diff --git a/README b/README
index 03a68e95c..56c78e34a 100644
--- a/README
+++ b/README
@@ -615,6 +615,8 @@ juan (https://github.com/nyancat18)
         - fixed Kdenlive, Shotcut profiles
         - new profiles for Cinelerra, Cliqz, Bluefish
         - profile hardening
+k4leg (https://github.com/k4leg)
+        - fix PyCharm profiles
 Kaan Genç (https://github.com/SeriousBug)
         - dynamic allocation of noblacklist buffer
 Karoshi42 (https://github.com/karoshi42)
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index 17f5af434..04c586f79 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -91,6 +91,9 @@ static char *usage_str =
         "    --deterministic-shutdown - terminate orphan processes.\n"
         "    --dns=address - set DNS server.\n"
         "    --dns.print=name|pid - print DNS configuration.\n"
+#ifdef HAVE_NETWORK
+        "    --dnstrace - monitor DNS queries.\n"
+#endif
         "    --env=name=value - set environment variable.\n"
         "    --fs.print=name|pid - print the filesystem log.\n"
 #ifdef HAVE_FILE_TRANSFER
@@ -99,6 +102,9 @@ static char *usage_str =
         "    --help, -? - this help screen.\n"
         "    --hostname=name - set sandbox hostname.\n"
         "    --hosts-file=file - use file as /etc/hosts.\n"
+#ifdef HAVE_NETWORK
+        "    --icmptrace - monitor Server Name Indiication (TLS/SNI).\n"
+#endif
         "    --ids-check - verify file system.\n"
         "    --ids-init - initialize IDS database.\n"
         "    --ignore=command - ignore command in profile files.\n"
@@ -154,8 +160,6 @@ static char *usage_str =
         "    --netns=name - Run the program in a named, persistent network namespace.\n"
         "    --netstats - monitor network statistics.\n"
         "    --nettrace - monitor received TCP, UDP and ICMP traffic.\n"
-        "    --nettrace - monitor DNS queries.\n"
-        "    --nettrace - monitor Server Name Indiication (TLS/SNI).\n"
 #endif
         "    --nice=value - set nice value.\n"
         "    --no3d - disable 3D hardware acceleration.\n"
diff --git a/src/fnettrace-dns/main.c b/src/fnettrace-dns/main.c
index 32122754f..48bf14710 100644
--- a/src/fnettrace-dns/main.c
+++ b/src/fnettrace-dns/main.c
@@ -70,6 +70,7 @@ void print_dns(uint32_t ip_src, unsigned char *pkt) {
                 type, (nxdomain)? " NXDOMAIN": "");
         if (strcmp(tmp, last)) {
                 printf("%s\n", tmp);
+                fflush(0);
                 strcpy(last, tmp);
         }
 
@@ -77,6 +78,7 @@ void print_dns(uint32_t ip_src, unsigned char *pkt) {
 
 errout:
         printf("%02d:%02d:%02d  %15s  Error: invalid DNS packet\n", t->tm_hour, t->tm_min, t->tm_sec, ip);
+        fflush(0);
 }
 
 // https://www.kernel.org/doc/html/latest/networking/filter.html
diff --git a/src/fnettrace-icmp/main.c b/src/fnettrace-icmp/main.c
index 986091bb4..bb857c922 100644
--- a/src/fnettrace-icmp/main.c
+++ b/src/fnettrace-icmp/main.c
@@ -64,19 +64,19 @@ char *code_dest_unreachable[16] = {
         "Host unreachable for ToS",
         "Communication administratively prohibited",
         "Host Precedence Violation",
-        "Precedence cutoff in effect "
+        "Precedence cutoff in effect"
 };
 
 char *code_redirect_message[4] = {
         "Datagram for the Network",
         "Datagram for the Host",
         "Datagram for the ToS & network",
-        "Datagram for the ToS & host "
+        "Datagram for the ToS & host"
 };
 
 char *code_time_exceeded[2] = {
         "TTL expired in transit",
-        "Fragment reassembly time exceeded "
+        "Fragment reassembly time exceeded"
 };
 
 char *code_bad_ip_header[3] = {
@@ -115,6 +115,7 @@ static void print_icmp(uint32_t ip_dest, uint32_t ip_src, uint8_t type, uint8_t
                 icmp_bytes,
                 type_ptr,
                 code_ptr);
+        fflush(0);
 }
 
 // https://www.kernel.org/doc/html/latest/networking/filter.html
diff --git a/src/fnettrace-sni/main.c b/src/fnettrace-sni/main.c
index 71793a560..d0f75dac9 100644
--- a/src/fnettrace-sni/main.c
+++ b/src/fnettrace-sni/main.c
@@ -77,6 +77,7 @@ static void print_tls(uint32_t ip_dest, unsigned char *pkt, unsigned len) {
                 snprintf(tmp, sizeof(last), "%02d:%02d:%02d  %-15s  %s", t->tm_hour, t->tm_min, t->tm_sec, ip, name);
                 if (strcmp(tmp, last)) {
                         printf("%s\n", tmp);
+                        fflush(0);
                         strcpy(last, tmp);
                 }
         }
@@ -86,6 +87,7 @@ static void print_tls(uint32_t ip_dest, unsigned char *pkt, unsigned len) {
 
 errout:
         printf("%02d:%02d:%02d  %-15s  Error: invalid TLS packet\n", t->tm_hour, t->tm_min, t->tm_sec, ip);
+        fflush(0);
         return;
 
 nosni:
diff --git a/src/fnettrace/static-ip-map b/src/fnettrace/static-ip-map
index d3d234f5a..c630b6688 100644
--- a/src/fnettrace/static-ip-map
+++ b/src/fnettrace/static-ip-map
@@ -48,6 +48,7 @@
 4.0.0.0/9 Level 3
 6.0.0.0/8 US Army
 7.0.0.0/8 US Army
+8.0.0.0/9 Level 3
 9.0.0.0/8 IBM
 11.0.0.0/8 US Army
 17.0.0.0/8 Apple
@@ -199,7 +200,103 @@
 151.139.0.0/16 StackPath
 
 # Linode
+103.29.68.0/22 Linode
+104.200.16.0/21 Linode
+104.200.24.0/22 Linode
+104.200.25.0/24 Linode
+104.200.26.0/24 Linode
+104.200.27.0/24 Linode
+104.200.28.0/22 Linode
+104.237.128.0/21 Linode
+104.237.136.0/21 Linode
+104.237.144.0/21 Linode
+104.237.152.0/21 Linode
+104.237.152.0/24 Linode
+104.237.153.0/24 Linode
+104.237.154.0/24 Linode
+104.237.155.0/24 Linode
+104.237.156.0/24 Linode
+104.237.157.0/24 Linode
+104.237.158.0/24 Linode
+104.237.159.0/24 Linode
+109.237.24.0/22 Linode
+109.74.192.0/20 Linode
+139.144.0.0/20 Linode
+139.144.104.0/21 Linode
+139.144.112.0/20 Linode
+139.144.128.0/21 Linode
+139.144.136.0/21 Linode
+139.144.144.0/20 Linode
+139.144.160.0/22 Linode
+139.144.16.0/20  Linode
+139.144.164.0/22 Linode
+139.144.168.0/21 Linode
+139.144.176.0/21 Linode
+139.144.184.0/21 Linode
+139.144.192.0/19 Linode
+139.144.224.0/21 Linode
+139.144.232.0/21 Linode
+139.144.240.0/22 Linode
+139.144.32.0/21 Linode
+139.144.40.0/21 Linode
+139.144.48.0/20 Linode
+139.144.64.0/20 Linode
+139.144.80.0/21 Linode
+139.144.88.0/21 Linode
+139.144.96.0/21 Linode
+139.162.0.0/19 Linode
+139.162.128.0/19 Linode
+139.162.160.0/19 Linode
+139.162.192.0/19 Linode
+139.162.224.0/19 Linode
+139.162.32.0/19 Linode
+139.162.64.0/19 Linode
+139.162.96.0/19 Linode
+139.177.176.0/21 Linode
+139.177.184.0/21 Linode
+139.177.192.0/21 Linode
+139.177.200.0/21 Linode
+151.236.216.0/21 Linode
+162.216.16.0/22  Linode
+170.187.128.0/24 Linode
+170.187.129.0/24 Linode
+170.187.131.0/24 Linode
+170.187.132.0/24 Linode
+170.187.134.0/23 Linode
+170.187.136.0/21 Linode
+170.187.144.0/20 Linode
+170.187.160.0/21 Linode
+170.187.168.0/21 Linode
+170.187.176.0/21 Linode
+170.187.184.0/21 Linode
+170.187.192.0/22 Linode
+170.187.196.0/22 Linode
+170.187.200.0/21 Linode
+170.187.208.0/20 Linode
+170.187.224.0/21 Linode
+170.187.232.0/21 Linode
+170.187.240.0/21 Linode
+170.187.248.0/21 Linode
 172.104.0.0/15 Linode
+172.104.128.0/19 Linode
+172.104.160.0/19 Linode
+172.104.192.0/21 Linode
+172.104.200.0/23 Linode
+172.104.202.0/23 Linode
+172.104.205.0/24 Linode
+172.104.206.0/24 Linode
+172.104.207.0/24 Linode
+172.104.208.0/20 Linode
+172.104.220.0/24 Linode
+172.104.224.0/19 Linode
+172.104.32.0/19 Linode
+172.104.4.0/22 Linode
+172.104.64.0/19 Linode
+172.104.8.0/21 Linode
+172.104.96.0/19 Linode
+172.105.0.0/19 Linode
+172.105.112.0/20 Linode
+172.105.128.0/23 Linode
 
 # Akamai
 23.0.0.0/12 Akamai