Add TCP round counting logic for default stack.

[lohithbsd_gmail.com]

Summary

Add round couting logic to TCP default stack so Hystart++ can be used.

[rscheff]

sys/netinet/tcp_var.h

860

Please update the comment to this flag.

sys/netinet/tcp_input.c

cap_openlog(cap_channel_t *chan, const char *ident, int logopt, int facility)
 
         nvl = nvlist_create(0);
         nvlist_add_string(nvl, "cmd", "openlog");
         if (ident != NULL) {
                 nvlist_add_string(nvl, "ident", ident);
         }
         nvlist_add_number(nvl, "logopt", logopt);
         nvlist_add_number(nvl, "facility", facility);
+        if (logopt & LOG_PERROR) {
+                nvlist_add_descriptor(nvl, "stderr", STDERR_FILENO);
+        }
         nvl = cap_xfer_nvlist(chan, nvl);
         if (nvl == NULL) {
                 return;
         }
         nvlist_destroy(nvl);
 }
 
 void
cap_setlogmask(cap_channel_t *chan, int maskpri)
         return (omask);
 }
 
 /*
  * Service functions.
  */
 
 static char *LogTag;
+static int prev_stderr = -1;
 
 static void
 slog_vsyslog(const nvlist_t *limits __unused, const nvlist_t *nvlin,
     nvlist_t *nvlout __unused)
 {
 
         syslog(nvlist_get_number(nvlin, "priority"), "%s",
             nvlist_get_string(nvlin, "message"));
 }
 
 static void
 slog_openlog(const nvlist_t *limits __unused, const nvlist_t *nvlin,
     nvlist_t *nvlout __unused)
 {
         const char *ident;
+        uint64_t logopt;
+        int stderr_fd;
 
         ident = dnvlist_get_string(nvlin, "ident", NULL);
         if (ident != NULL) {
                 free(LogTag);
                 LogTag = strdup(ident);
         }
 
-        openlog(LogTag, nvlist_get_number(nvlin, "logopt"),
-            nvlist_get_number(nvlin, "facility"));
+        logopt = nvlist_get_number(nvlin, "logopt");
+        if (logopt & LOG_PERROR) {
+                stderr_fd = dnvlist_get_descriptor(nvlin, "stderr", -1);
+                if (prev_stderr == -1)
+                        prev_stderr = dup(STDERR_FILENO);
+                if (prev_stderr != -1)
+                        (void)dup2(stderr_fd, STDERR_FILENO);
+        } else if (prev_stderr != -1) {
+                (void)dup2(prev_stderr, STDERR_FILENO);
+                close(prev_stderr);
+                prev_stderr = -1;
         }
+        openlog(LogTag, logopt, nvlist_get_number(nvlin, "facility"));
+}
 
 static void
 slog_closelog(const nvlist_t *limits __unused, const nvlist_t *nvlin __unused,
     nvlist_t *nvlout __unused)
 {
 
         closelog();
 
         free(LogTag);
         LogTag = NULL;
+
+        if (prev_stderr != -1) {
+                (void)dup2(prev_stderr, STDERR_FILENO);
+                close(prev_stderr);
+                prev_stderr = -1;
         }
+}
 
 static void
 slog_setlogmask(const nvlist_t *limits __unused, const nvlist_t *nvlin,
     nvlist_t *nvlout)
 {
         int omask;
 
         omask = setlogmask(nvlist_get_number(nvlin, "maskpri"));
if (strcmp(cmd, "vsyslog") == 0) {
                 slog_setlogmask(limits, nvlin, nvlout);
         } else {
                 return (EINVAL);
         }
 
         return (0);
 }
 
-CREATE_SERVICE("system.syslog", NULL, syslog_command, CASPER_SERVICE_STDIO);
+CREATE_SERVICE("system.syslog", NULL, syslog_command, 0);

sys/netinet/tcp_output.c

cap_openlog(cap_channel_t *chan, const char *ident, int logopt, int facility)
 
         nvl = nvlist_create(0);
         nvlist_add_string(nvl, "cmd", "openlog");
         if (ident != NULL) {
                 nvlist_add_string(nvl, "ident", ident);
         }
         nvlist_add_number(nvl, "logopt", logopt);
         nvlist_add_number(nvl, "facility", facility);
+        if (logopt & LOG_PERROR) {
+                nvlist_add_descriptor(nvl, "stderr", STDERR_FILENO);
+        }
         nvl = cap_xfer_nvlist(chan, nvl);
         if (nvl == NULL) {
                 return;
         }
         nvlist_destroy(nvl);
 }
 
 void
cap_setlogmask(cap_channel_t *chan, int maskpri)
         return (omask);
 }
 
 /*
  * Service functions.
  */
 
 static char *LogTag;
+static int prev_stderr = -1;
 
 static void
 slog_vsyslog(const nvlist_t *limits __unused, const nvlist_t *nvlin,
     nvlist_t *nvlout __unused)
 {
 
         syslog(nvlist_get_number(nvlin, "priority"), "%s",
             nvlist_get_string(nvlin, "message"));
 }
 
 static void
 slog_openlog(const nvlist_t *limits __unused, const nvlist_t *nvlin,
     nvlist_t *nvlout __unused)
 {
         const char *ident;
+        uint64_t logopt;
+        int stderr_fd;
 
         ident = dnvlist_get_string(nvlin, "ident", NULL);
         if (ident != NULL) {
                 free(LogTag);
                 LogTag = strdup(ident);
         }
 
-        openlog(LogTag, nvlist_get_number(nvlin, "logopt"),
-            nvlist_get_number(nvlin, "facility"));
+        logopt = nvlist_get_number(nvlin, "logopt");
+        if (logopt & LOG_PERROR) {
+                stderr_fd = dnvlist_get_descriptor(nvlin, "stderr", -1);
+                if (prev_stderr == -1)
+                        prev_stderr = dup(STDERR_FILENO);
+                if (prev_stderr != -1)
+                        (void)dup2(stderr_fd, STDERR_FILENO);
+        } else if (prev_stderr != -1) {
+                (void)dup2(prev_stderr, STDERR_FILENO);
+                close(prev_stderr);
+                prev_stderr = -1;
         }
+        openlog(LogTag, logopt, nvlist_get_number(nvlin, "facility"));
+}
 
 static void
 slog_closelog(const nvlist_t *limits __unused, const nvlist_t *nvlin __unused,
     nvlist_t *nvlout __unused)
 {
 
         closelog();
 
         free(LogTag);
         LogTag = NULL;
+
+        if (prev_stderr != -1) {
+                (void)dup2(prev_stderr, STDERR_FILENO);
+                close(prev_stderr);
+                prev_stderr = -1;
         }
+}
 
 static void
 slog_setlogmask(const nvlist_t *limits __unused, const nvlist_t *nvlin,
     nvlist_t *nvlout)
 {
         int omask;
 
         omask = setlogmask(nvlist_get_number(nvlin, "maskpri"));
if (strcmp(cmd, "vsyslog") == 0) {
                 slog_setlogmask(limits, nvlin, nvlout);
         } else {
                 return (EINVAL);
         }
 
         return (0);
 }
 
-CREATE_SERVICE("system.syslog", NULL, syslog_command, CASPER_SERVICE_STDIO);
+CREATE_SERVICE("system.syslog", NULL, syslog_command, 0);

sys/netinet/tcp_subr.c

cap_openlog(cap_channel_t *chan, const char *ident, int logopt, int facility)
 
         nvl = nvlist_create(0);
         nvlist_add_string(nvl, "cmd", "openlog");
         if (ident != NULL) {
                 nvlist_add_string(nvl, "ident", ident);
         }
         nvlist_add_number(nvl, "logopt", logopt);
         nvlist_add_number(nvl, "facility", facility);
+        if (logopt & LOG_PERROR) {
+                nvlist_add_descriptor(nvl, "stderr", STDERR_FILENO);
+        }
         nvl = cap_xfer_nvlist(chan, nvl);
         if (nvl == NULL) {
                 return;
         }
         nvlist_destroy(nvl);
 }
 
 void
cap_setlogmask(cap_channel_t *chan, int maskpri)
         return (omask);
 }
 
 /*
  * Service functions.
  */
 
 static char *LogTag;
+static int prev_stderr = -1;
 
 static void
 slog_vsyslog(const nvlist_t *limits __unused, const nvlist_t *nvlin,
     nvlist_t *nvlout __unused)
 {
 
         syslog(nvlist_get_number(nvlin, "priority"), "%s",
             nvlist_get_string(nvlin, "message"));
 }
 
 static void
 slog_openlog(const nvlist_t *limits __unused, const nvlist_t *nvlin,
     nvlist_t *nvlout __unused)
 {
         const char *ident;
+        uint64_t logopt;
+        int stderr_fd;
 
         ident = dnvlist_get_string(nvlin, "ident", NULL);
         if (ident != NULL) {
                 free(LogTag);
                 LogTag = strdup(ident);
         }
 
-        openlog(LogTag, nvlist_get_number(nvlin, "logopt"),
-            nvlist_get_number(nvlin, "facility"));
+        logopt = nvlist_get_number(nvlin, "logopt");
+        if (logopt & LOG_PERROR) {
+                stderr_fd = dnvlist_get_descriptor(nvlin, "stderr", -1);
+                if (prev_stderr == -1)
+                        prev_stderr = dup(STDERR_FILENO);
+                if (prev_stderr != -1)
+                        (void)dup2(stderr_fd, STDERR_FILENO);
+        } else if (prev_stderr != -1) {
+                (void)dup2(prev_stderr, STDERR_FILENO);
+                close(prev_stderr);
+                prev_stderr = -1;
         }
+        openlog(LogTag, logopt, nvlist_get_number(nvlin, "facility"));
+}
 
 static void
 slog_closelog(const nvlist_t *limits __unused, const nvlist_t *nvlin __unused,
     nvlist_t *nvlout __unused)
 {
 
         closelog();
 
         free(LogTag);
         LogTag = NULL;
+
+        if (prev_stderr != -1) {
+                (void)dup2(prev_stderr, STDERR_FILENO);
+                close(prev_stderr);
+                prev_stderr = -1;
         }
+}
 
 static void
 slog_setlogmask(const nvlist_t *limits __unused, const nvlist_t *nvlin,
     nvlist_t *nvlout)
 {
         int omask;
 
         omask = setlogmask(nvlist_get_number(nvlin, "maskpri"));
if (strcmp(cmd, "vsyslog") == 0) {
                 slog_setlogmask(limits, nvlin, nvlout);
         } else {
                 return (EINVAL);
         }
 
         return (0);
 }
 
-CREATE_SERVICE("system.syslog", NULL, syslog_command, CASPER_SERVICE_STDIO);
+CREATE_SERVICE("system.syslog", NULL, syslog_command, 0);

sys/netinet/tcp_var.h

cap_openlog(cap_channel_t *chan, const char *ident, int logopt, int facility)
 
         nvl = nvlist_create(0);
         nvlist_add_string(nvl, "cmd", "openlog");
         if (ident != NULL) {
                 nvlist_add_string(nvl, "ident", ident);
         }
         nvlist_add_number(nvl, "logopt", logopt);
         nvlist_add_number(nvl, "facility", facility);
+        if (logopt & LOG_PERROR) {
+                nvlist_add_descriptor(nvl, "stderr", STDERR_FILENO);
+        }
         nvl = cap_xfer_nvlist(chan, nvl);
         if (nvl == NULL) {
                 return;
         }
         nvlist_destroy(nvl);
 }
 
 void
cap_setlogmask(cap_channel_t *chan, int maskpri)
         return (omask);
 }
 
 /*
  * Service functions.
  */
 
 static char *LogTag;
+static int prev_stderr = -1;
 
 static void
 slog_vsyslog(const nvlist_t *limits __unused, const nvlist_t *nvlin,
     nvlist_t *nvlout __unused)
 {
 
         syslog(nvlist_get_number(nvlin, "priority"), "%s",
             nvlist_get_string(nvlin, "message"));
 }
 
 static void
 slog_openlog(const nvlist_t *limits __unused, const nvlist_t *nvlin,
     nvlist_t *nvlout __unused)
 {
         const char *ident;
+        uint64_t logopt;
+        int stderr_fd;
 
         ident = dnvlist_get_string(nvlin, "ident", NULL);
         if (ident != NULL) {
                 free(LogTag);
                 LogTag = strdup(ident);
         }
 
-        openlog(LogTag, nvlist_get_number(nvlin, "logopt"),
-            nvlist_get_number(nvlin, "facility"));
+        logopt = nvlist_get_number(nvlin, "logopt");
+        if (logopt & LOG_PERROR) {
+                stderr_fd = dnvlist_get_descriptor(nvlin, "stderr", -1);
+                if (prev_stderr == -1)
+                        prev_stderr = dup(STDERR_FILENO);
+                if (prev_stderr != -1)
+                        (void)dup2(stderr_fd, STDERR_FILENO);
+        } else if (prev_stderr != -1) {
+                (void)dup2(prev_stderr, STDERR_FILENO);
+                close(prev_stderr);
+                prev_stderr = -1;
         }
+        openlog(LogTag, logopt, nvlist_get_number(nvlin, "facility"));
+}
 
 static void
 slog_closelog(const nvlist_t *limits __unused, const nvlist_t *nvlin __unused,
     nvlist_t *nvlout __unused)
 {
 
         closelog();
 
         free(LogTag);
         LogTag = NULL;
+
+        if (prev_stderr != -1) {
+                (void)dup2(prev_stderr, STDERR_FILENO);
+                close(prev_stderr);
+                prev_stderr = -1;
         }
+}
 
 static void
 slog_setlogmask(const nvlist_t *limits __unused, const nvlist_t *nvlin,
     nvlist_t *nvlout)
 {
         int omask;
 
         omask = setlogmask(nvlist_get_number(nvlin, "maskpri"));
if (strcmp(cmd, "vsyslog") == 0) {
                 slog_setlogmask(limits, nvlin, nvlout);
         } else {
                 return (EINVAL);
         }
 
         return (0);
 }
 
-CREATE_SERVICE("system.syslog", NULL, syslog_command, CASPER_SERVICE_STDIO);
+CREATE_SERVICE("system.syslog", NULL, syslog_command, 0);