Merge pull request #52 from Srinivas11789/3.0

PcapXray 3.0
Srinivas11789 · Aug 22, 2019 · d0e299a · d0e299a
2 parents 204e37d + a77618a
commit d0e299a
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 2 deletions.
diff --git a/Design/ForensicsProjectSynopsis-PcapXray.pdf → ...ocs/ForensicsProjectSynopsis-PcapXray.pdf b/Design/ForensicsProjectSynopsis-PcapXray.pdf → ...ocs/ForensicsProjectSynopsis-PcapXray.pdf
diff --git a/Design/PcapXrayProjectSpecification.docx → ...gn/docs/PcapXrayProjectSpecification.docx b/Design/PcapXrayProjectSpecification.docx → ...gn/docs/PcapXrayProjectSpecification.docx
diff --git a/Design/PcapXrayProjectSpecification_.pdf → ...gn/docs/PcapXrayProjectSpecification_.pdf b/Design/PcapXrayProjectSpecification_.pdf → ...gn/docs/PcapXrayProjectSpecification_.pdf
diff --git a/Design/sketch_flow_diagram.pdf → Design/flow_diagram/sketch_flow_diagram.pdf b/Design/sketch_flow_diagram.pdf → Design/flow_diagram/sketch_flow_diagram.pdf
diff --git a/Design/sketch_flow_diagram_draft1.pdf → ...ow_diagram/sketch_flow_diagram_draft1.pdf b/Design/sketch_flow_diagram_draft1.pdf → ...ow_diagram/sketch_flow_diagram_draft1.pdf
diff --git a/Design/slides/pcapxray_defcon27.pdf b/Design/slides/pcapxray_defcon27.pdf
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# PcapXray [![Build Status](https://travis-ci.org/Srinivas11789/PcapXray.svg?branch=master)](https://travis-ci.org/Srinivas11789/PcapXray) [![codecov](https://codecov.io/gh/Srinivas11789/PcapXray/branch/master/graph/badge.svg)](https://codecov.io/gh/Srinivas11789/PcapXray)
+# PcapXray [![Build Status](https://travis-ci.org/Srinivas11789/PcapXray.svg?branch=master)](https://travis-ci.org/Srinivas11789/PcapXray) [![codecov](https://codecov.io/gh/Srinivas11789/PcapXray/branch/master/graph/badge.svg)](https://codecov.io/gh/Srinivas11789/PcapXray) [![defcon27](https://img.shields.io/badge/defcon27-demolabs-blue)](https://www.defcon.org/html/defcon-27/dc-27-demolabs.html#PcapXray)
     A Network Forensics Tool - To visualize a Packet Capture offline as a Network Diagram including device identification, highlight important communication and file extraction
 ![Alt text](https://srinivas11789.github.io/PcapXray/logo.png?width=20px "PcapXray")
 ## PcapXray Design Specification

diff --git a/run.sh b/run.sh
@@ -31,7 +31,8 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
     #docker run --rm -d --name pcapxray -e DISPLAY=$IP:0 -v /tmp/.X11-unix:/tmp/.X11-unix srinivas11789/pcapxray
     # Run Docker Image - Staging (Develop)
     docker run --rm -d --name pcapxray -v ${PWD}/artifacts:/tmp/artifacts -e DISPLAY=$IP:0 -v /tmp/.X11-unix:/tmp/.X11-unix srinivas11789/pcapxray-2_9
-
+    echo "XQuartz should be started and incoming connections should be allowed for this to work."
+    echo "Set the Report to /tmp/artifacts in UI to get reports in the shared directory /artifacts"
 
 #elif [[ "$OSTYPE" == "linux-gnu" ]]; then
 else
@@ -45,6 +46,7 @@ else
     #docker run --rm --net=host --env="DISPLAY" --volume="$HOME/.Xauthority:/root/.Xauthority:rw" srinivas11789/pcapxray
     # Run docker - Staging (Develop)
     docker run --rm -d --name pcapxray -v ${PWD}/artifacts:/tmp/artifacts --net=host --env="DISPLAY" --volume="$HOME/.Xauthority:/root/.Xauthority:rw" srinivas11789/pcapxray-2_9
+    echo "Set the Report to /tmp/artifacts in UI to get reports in the shared directory /artifacts"
 fi
 
 #else