Merge branch 'main' of https://github.com/GoDjango-Development/TFProtocol

Author: etherbeing

conf/example.conf

@@ -32,7 +32,7 @@ qBHnuLhINOFURgXeYmPMaEDIHkmdQ2GJg3aSfzPeBtxAfawxf6pf
 xsntmex /var/tfdb/xsntmex
 userdb /var/tfdb/lsr
 xsace /var/tfdb/xsace
-defusr user 
+defusr user
 tlb /var/tfdb/tlb
 pubkey {-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmm8HzASM58ZMT237SR/h

doc/tfproto_xs1.doc

@@ -26,6 +26,8 @@
 /* Enum to indicate the category of the log action */
 enum logcat { LGC_CRITICAL, LGC_INFO, LGC_WARNING };
 
+extern int dmode;
+
 /* This function write to syslog */
 void wrlog(const char *msg, enum logcat cat);
 

doc/tfproto_xs1.pdf

@@ -55,7 +55,7 @@
 /* Short length string. */
 #define SHORTSTR 255
 /* Default creation file permission: 0644. */
-#define DEFFILE_PERM S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH
+#define DEFFILE_PERM S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH
 /* Default creation directory permission: 0755. */
 #define DEFDIR_PERM S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH
 

include/log.h

@@ -5,12 +5,16 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <log.h>
+#include <stdio.h>
 
 /* Strings for using with syslog */
 #define LGC_CRITICAL_STR "[ CRITICAL ]"
 #define LGC_INFO_STR "[ INFO ]"
 #define LGC_WARNING_STR "[ WARNING ]"
 
+/* non-zero if tfprotocol is running in daemon mode. */
+int dmode;
+
 void wrlog(const char *msg, enum logcat cat)
 {
     char *catpt = NULL;
@@ -26,5 +30,8 @@ void wrlog(const char *msg, enum logcat cat)
         break;
     }
     syslog(LOG_INFO | LOG_DAEMON, "%s %d %s %s","PID: :", getpid(), msg, catpt);
+    if (!dmode)
+        printf("%s %s %s %d\n", catpt, msg, "PID: ", getpid());
     closelog();
 }
+

include/util.h

@@ -25,6 +25,8 @@ static void mkdaemon(void);
 
 int main(int argc, char **argv)
 {
+    if (argc >= 3)
+        dmode = 1;
     if (argc < 2) {
         wrlog(ELOGDARG, LGC_CRITICAL);
         exit(EXIT_FAILURE);

src/log.c

@@ -259,8 +259,7 @@ static int xs1_chkidx(const char *pt)
     if (!strcmp(num, ""))
         return -1;
     int32_t idx = atoll(num);
-    if (idx < 0 || idx >= ds.count || !(ds.fds + idx) || 
-        *(ds.fds + idx) == -1)
+    if (idx < 0 || idx >= ds.count || *(ds.fds + idx) == -1)
         return -1;
     return idx;
 }
@@ -529,7 +528,7 @@ static void xs1_cmdreadv2(void)
 
 static int xs1_chkidx_int64(int64_t idx)
 {
-     if (idx < 0 || idx >= ds.count || !(ds.fds + idx) || *(ds.fds + idx) == -1)
+     if (idx < 0 || idx >= ds.count || *(ds.fds + idx) == -1)
         return -1;
     return idx;
 }