fixed up _sdl; add GDSS debugging code

diff --git a/server/qsupport.dc b/server/qsupport.dc
index 1e575db0997ecc10f3a890f2d474c377c59829a1..695d2c1e0e2a08779a2c7d0a1118330611d83211 100644 (file)
--- a/server/qsupport.dc
+++ b/server/qsupport.dc
@@ -1457,16 +1457,14 @@ followup_guax(q, sq, v, action, actarg, cl)
             free(kname);
            rsig.data_buf[rsig.data_size] = 0;
             si.rawsig = (unsigned char *)strsave(rsig.data_buf);
             free(kname);
            rsig.data_buf[rsig.data_size] = 0;
             si.rawsig = (unsigned char *)strsave(rsig.data_buf);

-#ifdef DEBUG
-           com_err(whoami, 0, "rawsig length = %d, sig=\"%s\"", strlen(si.rawsig), si.rawsig);
-#endif /* DEBUG */
+           if (log_flags & LOG_GDSS)
+             com_err(whoami, 0, "rawsig length = %d, sig=\"%s\"", strlen(si.rawsig), si.rawsig);

            GDSS_Recompose(&si, sigbuf);
            free(si.rawsig);
            free(argv[U_SIGNATURE]);
            argv[U_SIGNATURE] = strsave(sigbuf);
            GDSS_Recompose(&si, sigbuf);
            free(si.rawsig);
            free(argv[U_SIGNATURE]);
            argv[U_SIGNATURE] = strsave(sigbuf);

-#ifdef DEBUG
-           com_err(whoami, 0, "generated signature length %d", strlen(sigbuf));
-#endif /* DEBUG */
+           if (log_flags & LOG_GDSS)
+             com_err(whoami, 0, "generated signature length %d", strlen(sigbuf));

        }
 #endif /* GDSS */
        (*action)(q->vcnt, argv, actarg);
        }
 #endif /* GDSS */
        (*action)(q->vcnt, argv, actarg);


@@ -1541,8 +1539,11 @@ followup_ausr(q, argv, cl)
             } else if (status)
               return(status);
             timestamp = si.timestamp;
             } else if (status)
               return(status);
             timestamp = si.timestamp;

-        } else
-          return(gdss2et(status));
+        } else {
+           if (log_flags & LOG_GDSS)
+             hex_dump(argv[U_SIGNATURE]);
+           return(gdss2et(status));
+       }

       } else {
         rawsig[0] = 0;
         sigwho = 0;
       } else {
         rawsig[0] = 0;
         sigwho = 0;


@@ -1641,8 +1642,11 @@ followup_uuac(q, argv, cl)
             } else if (status)
               return(status);
             timestamp = si.timestamp;
             } else if (status)
               return(status);
             timestamp = si.timestamp;

-        } else
-          return(gdss2et(status));
+        } else {
+           if (log_flags & LOG_GDSS)
+             hex_dump(argv[U_SIGNATURE+1]);
+           return(gdss2et(status));
+       }

     } else {
         rawsig[0] = 0;
         sigwho = 0;
     } else {
         rawsig[0] = 0;
         sigwho = 0;


@@ -3509,11 +3513,12 @@ int _sdl_followup(q, argv, cl)
     int i;
     i = atoi(argv[0]);
     log_flags = i;
     int i;
     i = atoi(argv[0]);
     log_flags = i;

-    if (i && LOG_SQL) {
+    if (i & LOG_SQL) {

        EXEC SQL set printqry;
     } else {
        EXEC SQL set printqry;
     } else {

-       EXEC SQL set no printqry;
+       EXEC SQL set noprintqry;

     }
     }

+    return(MR_SUCCESS);

 }
 
 
 }
 
 


@@ -4203,4 +4208,51 @@ mr_select_any(stmt)
 } 
 
 
 } 
 
 

+
+static hex_dump(p)
+unsigned  char *p;
+{
+    char buf[BUFSIZ];
+    int i;
+
+    fprintf(stderr, "Size: %d\n", strlen(p));
+    while (strlen(p) >= 8) {
+       fprintf(stderr, "%02x %02x %02x %02x %02x %02x %02x %02x\n",
+               p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
+       p += 8;
+    }
+    switch (strlen(p)) {
+    case 7:
+       fprintf(stderr, "%02x %02x %02x %02x %02x %02x %02x\n",
+               p[0], p[1], p[2], p[3], p[4], p[5], p[6]);
+       break;
+    case 6:
+       fprintf(stderr, "%02x %02x %02x %02x %02x %02x\n",
+               p[0], p[1], p[2], p[3], p[4], p[5]);
+       break;
+    case 5:
+       fprintf(stderr, "%02x %02x %02x %02x %02x\n",
+               p[0], p[1], p[2], p[3], p[4]);
+       break;
+    case 4:
+       fprintf(stderr, "%02x %02x %02x %02x\n",
+               p[0], p[1], p[2], p[3]);
+       break;
+    case 3:
+       fprintf(stderr, "%02x %02x %02x\n",
+               p[0], p[1], p[2]);
+       break;
+    case 2:
+       fprintf(stderr, "%02x %02x\n",
+               p[0], p[1]);
+       break;
+    case 1:
+       fprintf(stderr, "%02x\n",
+               p[0]);
+       break;
+    default:
+       return;
+    }
+}
+

 /* eof:qsupport.dc */
 /* eof:qsupport.dc */