Clean up smb/dcerpc code

src/app-layer-dcerpc.c

@@ -41,15 +41,17 @@ static int DCERPCParseCTXItem(Flow *f, void *dcerpc_state, AppLayerParserState *
     SCEnter();
     DCERPCState *sstate = (DCERPCState *)dcerpc_state;
     uint8_t *p = input;
-    uint8_t i = 0;
+
     if (input_len) {
-        switch(sstate->ctxbytesprocessed) {
-            case 0:
-		/*sstate->item = (struct entry *) malloc(sizeof(struct entry));
         if (sstate->item == NULL) {
-			return -1;
+            sstate->item = (struct entry *) malloc(sizeof(struct entry));
+            if (sstate->item == NULL) {
+                SCReturnInt(-1);
             }
-		*/
+        }
+
+        switch(sstate->ctxbytesprocessed) {
+            case 0:
                 sstate->item->ctxid = *(p++);
                 if (!(--input_len)) break;
             case 1:
@@ -110,10 +112,13 @@ static int DCERPCParseCTXItem(Flow *f, void *dcerpc_state, AppLayerParserState *
                 if (!(--input_len)) break;
             case 19:
                 sstate->item->uuid[15] = *(p++);
+#if 0
+                int i = 0;
                 for (i = 0; i < 16; i++) {
                     printf("%02x", sstate->item->uuid[i]);
                 }
                 printf("\n");
+#endif
                 //	TAILQ_INSERT_TAIL(&sstate->head, sstate->item, entries);
                 if (!(--input_len)) break;
             case 20:
@@ -483,8 +488,8 @@ void RegisterDCERPCParsers(void) {
 
 int DCERPCParserTest01(void) {
     int result = 1;
-    uint8_t i = 0;
-    struct entry *item;
+//    uint8_t i = 0;
+//    struct entry *item;
 
     Flow f;
     uint8_t dcerpcbuf[] = {
@@ -640,7 +645,7 @@ int DCERPCParserTest01(void) {
         goto end;
     }
 
-    printf("dcerpcbuf size %u\n", dcerpclen);
+//    printf("dcerpcbuf size %u\n", dcerpclen);
     DCERPCState *dcerpc_state = ssn.aldata[AlpGetStateIdx(ALPROTO_DCERPC)];
     if (dcerpc_state == NULL) {
         printf("no dcerpc state: ");
@@ -666,7 +671,7 @@ int DCERPCParserTest01(void) {
        result = 0;
        goto end;
     }
-
+#if 0
     printf("UUID:\n");
     TAILQ_FOREACH(item, &dcerpc_state->head, entries) {
         printf("CTX Item %d\n", item->ctxid);
@@ -675,7 +680,7 @@ int DCERPCParserTest01(void) {
         }
         printf("\n");
     }
-
+#endif
 end:
     return result;
 }

src/app-layer-smb.c

@@ -366,7 +366,8 @@ static int DataParser(void *smb_state, AppLayerParserState *pstate,
 
     if (sstate->andx.paddingparsed) {
         while (sstate->andx.datalength-- && sstate->bytecount.bytecount-- && input_len--) {
-            printf("0x%02x ", *(p++));
+            SCLogDebug("0x%02x ", *p);
+            p++;
         }
     }
     sstate->bytesprocessed += (p - input);
@@ -449,9 +450,9 @@ static int SMBParseWordCount(Flow *f, void *smb_state, AppLayerParserState *psta
         return retval;
     } else { /* Generic WordCount Handler */
         while (sstate->wordcount.wordcount-- && input_len--) {
-            printf("0x%02x ", *(p++));
+            SCLogDebug("0x%02x ", *p);
+            p++;
         }
-        printf("\n");
         sstate->bytesprocessed += (p - input);
         return (p - input);
         SCReturnInt(p - input);
@@ -486,13 +487,13 @@ static int SMBParseByteCount(Flow *f, void *smb_state, AppLayerParserState *psta
     }
 
     while (sstate->bytecount.bytecount && input_len) {
-        SCLogDebug("0x%02x bytecount %u input_len %u", *(p++),
+        SCLogDebug("0x%02x bytecount %u input_len %u", *p,
                 sstate->bytecount.bytecount, input_len);
+        p++;
 
         sstate->wordcount.wordcount--;
         input_len--;
     }
-    printf("\n");
     sstate->bytesprocessed += (p - input);
 
     SCReturnInt(p - input);
@@ -731,7 +732,7 @@ static int SMBParse(Flow *f, void *smb_state, AppLayerParserState *pstate,
                                                 parsed, input_len, output);
 			parsed += retval;
 			input_len -= retval;
-			printf("SMB Header (%u/%u) Command 0x%02x parsed %u input_len %u\n",
+			SCLogDebug("SMB Header (%u/%u) Command 0x%02x parsed %u input_len %u",
 					sstate->bytesprocessed, NBSS_HDR_LEN + SMB_HDR_LEN,
 					sstate->smb.command, parsed, input_len);
 		}
@@ -743,7 +744,7 @@ static int SMBParse(Flow *f, void *smb_state, AppLayerParserState *pstate,
                                                          output);
 				parsed += retval;
 				input_len -= retval;
-				printf("Wordcount (%u) parsed %u input_len %u\n",
+				SCLogDebug("wordcount (%u) parsed %u input_len %u",
 						sstate->wordcount.wordcount, parsed, input_len);
 			}