[Sblim-commit] sfcb httpAdapter.c,1.11,1.12 httpComm.c,1.1.1.1,1.2 sfcBroker.c,1.15,1.16 trace.c,1.4,1.5 trace.h,1.5,1.6

[Adrian S. <a3s...@us...>]

Update of /cvsroot/sblim/sfcb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2704

Modified Files:
	httpAdapter.c httpComm.c sfcBroker.c trace.c trace.h 
Log Message:
sfcbd now supports hex input for the -tm parameter.
-tm ? now lists trace maks numbers as decimal and hex numbers
sfcbd now support TRACE_XMLIN (0x01000) and TRACE_XMLOUT (0x02000)


Index: trace.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/trace.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- trace.c	21 May 2005 22:02:41 -0000	1.4
+++ trace.c	20 Jun 2005 13:09:44 -0000	1.5
@@ -61,6 +61,8 @@
   {"indProvider",       TRACE_INDPROVIDER},
   {"internalProvider",  TRACE_INTERNALPROVIDER},
   {"objectImpl",        TRACE_OBJECTIMPL},
+  {"xmlIn",             TRACE_XMLIN},
+  {"xmlOut",            TRACE_XMLOUT},
   {"sockets",           TRACE_SOCKETS},
   {"memoryMgr",         TRACE_MEMORYMGR},
   {"msgQueue",          TRACE_MSGQUEUE},

Index: trace.h
===================================================================
RCS file: /cvsroot/sblim/sfcb/trace.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- trace.h	3 Jun 2005 10:31:57 -0000	1.5
+++ trace.h	20 Jun 2005 13:09:44 -0000	1.6
@@ -110,11 +110,13 @@
 #define TRACE_INDPROVIDER       512
 #define TRACE_INTERNALPROVIDER  1024
 #define TRACE_OBJECTIMPL        2048
-#define TRACE_SOCKETS           4096
-#define TRACE_MEMORYMGR         8192
-#define TRACE_MSGQUEUE          16384
-#define TRACE_XMLPARSING        32768 
-#define TRACE_DBPDAEMON         65536       
+#define TRACE_XMLIN             4096
+#define TRACE_XMLOUT            8192
+#define TRACE_SOCKETS           16384
+#define TRACE_MEMORYMGR         32768
+#define TRACE_MSGQUEUE          65536
+#define TRACE_XMLPARSING        131072  
+#define TRACE_DBPDAEMON         262144       
 
 typedef void sigHandler(int);
 

Index: sfcBroker.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcBroker.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- sfcBroker.c	14 Jun 2005 11:42:04 -0000	1.15
+++ sfcBroker.c	20 Jun 2005 13:09:44 -0000	1.16
@@ -378,15 +378,17 @@
          if (*argv[i+1]=='?') {
             fprintf(stdout,"--- -tm values:\n");
             for (i=0; traceIds[i].id; i++)  
-               fprintf(stdout,"--- \t%18s: %d\n",traceIds[i].id,traceIds[i].code);
+               fprintf(stdout,"--- \t%18s:    %d\t0x%05X\n",traceIds[i].id,traceIds[i].code,traceIds[i].code);
             exit(1);
          }
          if (isdigit(*argv[i + 1])) {
-            tmask = atoi(argv[++i]);
+            char *ep;
+            tmask = strtol(argv[++i], &ep, 0);
+//                   tmask = atoi(argv[++i]);
          }
       }
       else if (strcmp(argv[i], "-c") == 0 && i<(argc-1)) {
-	configfile = strdup(argv[++i]);
+         configfile = strdup(argv[++i]);
       }
       else if (strcmp(argv[i], "-F") == 0);
       else if (strcmp(argv[i], "-nF") == 0);

Index: httpComm.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/httpComm.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- httpComm.c	9 Mar 2005 12:25:12 -0000	1.1.1.1
+++ httpComm.c	20 Jun 2005 13:09:44 -0000	1.2
@@ -60,6 +60,14 @@
 
    _SFCB_ENTER(TRACE_HTTPDAEMON, "commWrite");
 
+#ifdef SFCB_DEBUG
+  if ((_sfcb_trace_mask & TRACE_XMLOUT) ) {
+     fprintf(stderr,"-#- xmlOut %d bytes:\n%*s",count,count,(char*)data);
+     if (*(((char*)data)+count-1)!='\n') fprintf(stderr,"\n");
+     fprintf(stderr,"-#- xmlOut end\n");
+  }
+#endif 
+  
 #if defined USE_SSL
    if (to.ssl) {
       rc = SSL_write(to.ssl, data, count);

Index: httpAdapter.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- httpAdapter.c	14 Jun 2005 11:42:04 -0000	1.11
+++ httpAdapter.c	20 Jun 2005 13:09:34 -0000	1.12
@@ -686,6 +686,16 @@
      CimXmlRequestContext ctx =
         { inBuf.content, inBuf.principle, inBuf.host, len - hl, &conn_fd };
       ctx.chunkFncs=&httpChunkFunctions;
+      
+#ifdef SFCB_DEBUG
+      if ((_sfcb_trace_mask & TRACE_XMLIN) ) {
+         fprintf(stderr,"-#- xmlIn %d bytes:\n%*s",inBuf.content_length,
+            inBuf.content_length,(char*)inBuf.content);
+         if (*(((char*)inBuf.content)+inBuf.content_length-1)!='\n') fprintf(stderr,"\n");
+         fprintf(stderr,"-#- xmlIn end\n");
+      }  
+#endif 
+      
       response = handleCimXmlRequest(&ctx);
    }
    free(hdr);