Merge branch 'master' of https://github.com/danmia/pcapdaemon

CDespeaux · Sep 21, 2016 · a0ab54a · a0ab54a
2 parents 8ae8d23 + d082539
commit a0ab54a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/capture.go b/capture.go
@@ -167,14 +167,23 @@ func captureToBuffer(req Capmsg, iface string)  {
         if(ferr != nil)  {
             fmt.Printf("Error writing file: %s", ferr)
             log.Printf("Error writing file: %s", ferr)
+        } else {
+            log.Printf("Written locally file: %s", config.Gen.Localdir + "/" + fileName)
+            fmt.Printf("Written locally file: %s", config.Gen.Localdir + "/" + fileName)
         }
+
     }
 
     if(config.Cs.Upload)  {
+        log.Printf("Uploading to Cloudshark file: %s", fileName)
+        fmt.Printf("Uploading to Cloudshark file: %s", fileName)
         postBufferCloudshark(config.Cs.Scheme, config.Cs.Host, config.Cs.Port, config.Cs.Token, f, fileName, tagstr)
     }
 
 	if(config.Aws.Upload)  {
+        log.Printf("Uploading to S3 file: %s", fileName)
+        log.Printf("Uploading to S3 file: %s", fileName)
+
 		var msgfolder string
 		var msgbucket string
 		var msgacl string
@@ -223,6 +232,9 @@ func captureToBuffer(req Capmsg, iface string)  {
 		msgconfig.Region = &msgregion	
         msgconfig.Endpoint = &msgep
 
+        log.Printf("Uploading to S3 file: %s", msgbucket + ":" + msgfolder + "/" + fileName)
+        fmt.Printf("Uploading to S3 file: %s", msgbucket + ":" + msgfolder + "/" + fileName)
+
 		postS3(*msgconfig, msgbucket, f, fileName, tagstr, msgfolder, msgacl, msgenc)
 	}
 

diff --git a/postdata.go b/postdata.go
@@ -91,6 +91,8 @@ func postBufferCloudshark(scheme string, host string, port int, token string, bu
         fmt.Println(resp.StatusCode)
         fmt.Println(resp.Header)
         fmt.Println(body)
+        log.Println("Successfully uploaded ", filename, " to Cloudshark")
+        fmt.Println("Successfully uploaded ", filename, " to Cloudshark")
     }
 }