3 files changed, 46 insertions, 3 deletions

diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index 9548ecb5b..e2fab1265 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -61,6 +61,7 @@ int checkcfg(int val) {
                 cfg_val[CFG_ALLOW_TRAY] = 0;
                 cfg_val[CFG_CHROOT] = 0;
                 cfg_val[CFG_SECCOMP_LOG] = 0;
+                cfg_val[CFG_PRIVATE_LIB] = 0;
 
                 // open configuration file
                 const char *fname = SYSCONFDIR "/firejail.config";
diff --git a/src/fnettrace/main.c b/src/fnettrace/main.c
index 634d408a3..f5e9bea65 100644
--- a/src/fnettrace/main.c
+++ b/src/fnettrace/main.c
@@ -222,8 +222,27 @@ static unsigned adjust_bandwidth(unsigned bw) {
 }
 
 static inline const char *common_port(uint16_t port) {
-        if (port > 123)
+        if (port > 194) {
+                if (port >= 6660 && port <= 6669)
+                        return "(IRC)";
+                else if (port == 6679)
+                        return "(IRC)";
+                else if (port == 6771)
+                        return "(BitTorrent)";
+                else if (port >= 6881 && port <= 6999)
+                        return "(BitTorrent)";
+                else if (port == 9001)
+                        return "(Tor)";
+                else if (port == 9030)
+                        return "(Tor)";
+                else if (port == 9050)
+                        return "(Tor)";
+                else if (port == 9051)
+                        return "(Tor)";
+                else if (port == 9150)
+                        return "(Tor)";
                 return NULL;
+        }
 
         if (port == 20 || port == 21)
                 return "(FTP)";
@@ -245,8 +264,16 @@ static inline const char *common_port(uint16_t port) {
                 return "(POP2)";
         else if (port == 110)
                 return "(POP3)";
+        else if (port == 113)
+                return "(IRC)";
         else if (port == 123)
                 return "(NTP)";
+        else if (port == 161)
+                return "(SNMP)";
+        else if (port == 162)
+                return "(SNMP)";
+        else if (port == 194)
+                return "(IRC)";
 
         return NULL;
 }
@@ -321,12 +348,19 @@ static void hnode_print(unsigned bw) {
                                 protocol = "(TLS)";
                         else if (ptr->port_src == 53)
                                 protocol = "(DNS)";
-                        else if (ptr->port_src == 853)
-                                protocol = "(DoT)";
+                        else if (ptr->port_src == 853) {
+                                if (ptr->protocol == 0x06)
+                                        protocol = "(DoT)";
+                                else if (ptr->protocol == 0x11)
+                                        protocol = "(DoQ)";
+                                else
+                                        protocol = NULL;
+                        }
                         else if ((protocol = common_port(ptr->port_src)) != NULL)
                                 ;
                         else if (ptr->protocol == 0x11)
                                 protocol = "(UDP)";
+
                         if (protocol == NULL)
                                 protocol = "";
 
diff --git a/src/profstats/main.c b/src/profstats/main.c
index 595a94c11..9deb72f7e 100644
--- a/src/profstats/main.c
+++ b/src/profstats/main.c
@@ -38,6 +38,7 @@ static int cnt_privatebin = 0;
 static int cnt_privatedev = 0;
 static int cnt_privatetmp = 0;
 static int cnt_privateetc = 0;
+static int cnt_privatelib = 0;
 static int cnt_whitelistvar = 0;        // include whitelist-var-common.inc
 static int cnt_whitelistrunuser = 0;    // include whitelist-runuser-common.inc
 static int cnt_whitelistusrshare = 0;   // include whitelist-usr-share-common.inc
@@ -56,6 +57,7 @@ static int arg_privatebin = 0;
 static int arg_privatedev = 0;
 static int arg_privatetmp = 0;
 static int arg_privateetc = 0;
+static int arg_privatelib = 0;
 static int arg_whitelistvar = 0;
 static int arg_whitelistrunuser = 0;
 static int arg_whitelistusrshare = 0;
@@ -181,6 +183,8 @@ static void process_file(char *fname) {
                         cnt_privatetmp++;
                 else if (strncmp(ptr, "private-etc", 11) == 0)
                         cnt_privateetc++;
+                else if (strncmp(ptr, "private-lib", 11) == 0)
+                        cnt_privatelib++;
                 else if (strncmp(ptr, "dbus-system none", 16) == 0)
                         cnt_dbus_system_none++;
                 else if (strncmp(ptr, "dbus-system", 11) == 0)
@@ -297,6 +301,7 @@ int main(int argc, char **argv) {
                 int privatetmp = cnt_privatetmp;
                 int privatedev = cnt_privatedev;
                 int privateetc = cnt_privateetc;
+                int privatelib = cnt_privatelib;
                 int dotlocal = cnt_dotlocal;
                 int globalsdotlocal = cnt_globalsdotlocal;
                 int whitelisthome = cnt_whitelisthome;
@@ -360,6 +365,8 @@ int main(int argc, char **argv) {
                         printf("No private-tmp found in %s\n", argv[i]);
                 if (arg_privateetc && privateetc == cnt_privateetc)
                         printf("No private-etc found in %s\n", argv[i]);
+                if (arg_privatelib && privatelib == cnt_privatelib)
+                        printf("No private-lib found in %s\n", argv[i]);
                 if (arg_whitelisthome && whitelisthome == cnt_whitelisthome)
                         printf("Home directory not whitelisted in %s\n", argv[i]);
                 if (arg_whitelistvar && whitelistvar == cnt_whitelistvar)
@@ -394,6 +401,7 @@ int main(int argc, char **argv) {
         printf("    private-bin\t\t\t%d\n", cnt_privatebin);
         printf("    private-dev\t\t\t%d\n", cnt_privatedev);
         printf("    private-etc\t\t\t%d\n", cnt_privateetc);
+        printf("    private-lib\t\t\t%d\n", cnt_privatelib);
         printf("    private-tmp\t\t\t%d\n", cnt_privatetmp);
         printf("    whitelist home directory\t%d\n", cnt_whitelisthome);
         printf("    whitelist var\t\t%d   (include whitelist-var-common.inc)\n", cnt_whitelistvar);