Skip to content

Merge diverging changes from source repo #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Merge diverging changes from source repo #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5df1a62
Jun 6, 2021
97d5640
Update ReadMe.txt
Jun 7, 2021
dec65b9
Jul 3, 2021
d212d6c
Jul 5, 2021
e2c2ff2
Update LICENSE.txt
Jan 5, 2022
98a5eba
Update LICENSE.txt
Jan 5, 2022
f69a1e9
Merge pull request #2 from ahlashkari/master
DrDougPhD Apr 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ReadMe.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ ECE Flag Count Number of packets with ECE
down/Up Ratio Download and upload ratio
Average Packet Size Average size of packet
Fwd Segment Size Avg Average size observed in the forward direction
Bwd Segment Size Avg Average number of bytes bulk rate in the backward direction
Bwd Segment Size Avg Average size observed in the backward direction
Fwd Bytes/Bulk Avg Average number of bytes bulk rate in the forward direction
Fwd Packet/Bulk Avg Average number of packets bulk rate in the forward direction
Fwd Bulk Rate Avg Average number of bulk rate in the forward direction
Expand Down
26 changes: 24 additions & 2 deletions src/main/java/cic/cs/unb/ca/jnetpcap/BasicFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public class BasicFlow {
private int bPSH_cnt;
private int fURG_cnt;
private int bURG_cnt;
private int fFIN_cnt;
private int bFIN_cnt;

private long Act_data_pkt_forward;
private long min_seg_size_forward;
Expand Down Expand Up @@ -108,6 +110,8 @@ public void initParameters(){
this.bPSH_cnt=0;
this.fURG_cnt=0;
this.bURG_cnt=0;
this.fFIN_cnt=0;
this.bFIN_cnt=0;
this.fHeaderBytes=0L;
this.bHeaderBytes=0L;

Expand Down Expand Up @@ -346,7 +350,7 @@ void detectUpdateSubflows( BasicPacketInfo packet ){
sfAcHelper = packet.getTimeStamp();
}
//System.out.print(" - "+(packet.timeStamp - sfLastPacketTS));
if( (packet.getTimeStamp() - (sfLastPacketTS)/(double)1000000) > 1.0 ){
if(((packet.getTimeStamp() - sfLastPacketTS)/(double)1000000) > 1.0){
sfCount ++ ;
long lastSFduration = packet.getTimeStamp() - sfAcHelper;
updateActiveIdleTime(packet.getTimeStamp(), this.activityTimeout);
Expand Down Expand Up @@ -677,7 +681,7 @@ public String dumpFlowBasedFeatures(){
dump+=fAvgBytesPerBulk()+",";
dump+=fAvgPacketsPerBulk()+",";
dump+=fAvgBulkRate()+",";
dump+=fAvgBytesPerBulk()+",";
dump+=bAvgBytesPerBulk()+",";
dump+=bAvgPacketsPerBulk()+",";
dump+=bAvgBulkRate()+",";

Expand Down Expand Up @@ -975,6 +979,24 @@ public int getBwdURGFlags() {
return bURG_cnt;
}

public int getFwdFINFlags() {
return fFIN_cnt;
}

public int getBwdFINFlags() {
return bFIN_cnt;
}

public int setFwdFINFlags() {
fFIN_cnt++;
return fFIN_cnt;
}

public int setBwdFINFlags() {
bFIN_cnt++;
return bFIN_cnt;
}

public long getFwdHeaderLength() {
return fHeaderBytes;
}
Expand Down
118 changes: 107 additions & 11 deletions src/main/java/cic/cs/unb/ca/jnetpcap/FlowGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Arrays;

import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
Expand Down Expand Up @@ -106,24 +108,118 @@ public void addPacket(BasicPacketInfo packet){
logger.debug("Timeout current has {} flow",cfsize);
}

// Flow finished due FIN flag (tcp only):
// // Flow finished due FIN flag (tcp only):
// // 1.- we add the packet-in-process to the flow (it is the last packet)
// // 2.- we move the flow to finished flow list
// // 3.- we eliminate the flow from the current flow list
// }else if(packet.hasFlagFIN()){
// logger.debug("FlagFIN current has {} flow",currentFlows.size());
// flow.addPacket(packet);
// if (mListener != null) {
// mListener.onFlowGenerated(flow);
// } else {
// finishedFlows.put(getFlowCount(), flow);
// }
// currentFlows.remove(id);
}else if(packet.hasFlagFIN()){
//
// Forward Flow
//
if (Arrays.equals(flow.getSrc(), packet.getSrc())) {
// How many forward FIN received?
if (flow.setFwdFINFlags() == 1) {
// Flow finished due FIN flag (tcp only)?:
// 1.- we add the packet-in-process to the flow (it is the last packet)
// 2.- we move the flow to finished flow list
// 3.- we eliminate the flow from the current flow list
if ((flow.getBwdFINFlags() + flow.getBwdFINFlags()) == 2) {
logger.debug("FlagFIN current has {} flow",currentFlows.size());
flow.addPacket(packet);
if (mListener != null) {
mListener.onFlowGenerated(flow);
} else {
finishedFlows.put(getFlowCount(), flow);
}
currentFlows.remove(id);
// Forward Flow Finished.
} else {
logger.info("Forward flow closed due to FIN Flag");
flow.updateActiveIdleTime(currentTimestamp,this.flowActivityTimeOut);
flow.addPacket(packet);
currentFlows.put(id,flow);
}
}else{
// some error
// TODO: review what to do with the packet
logger.warn("Forward flow received {} FIN packets", flow.getFwdFINFlags());
}
//
// Backward Flow
//
} else {
// How many backward FIN packets received?
if (flow.setBwdFINFlags() == 1) {
// Flow finished due FIN flag (tcp only)?:
// 1.- we add the packet-in-process to the flow (it is the last packet)
// 2.- we move the flow to finished flow list
// 3.- we eliminate the flow from the current flow list
if ((flow.getBwdFINFlags() + flow.getBwdFINFlags()) == 2) {
logger.debug("FlagFIN current has {} flow",currentFlows.size());
flow.addPacket(packet);
if (mListener != null) {
mListener.onFlowGenerated(flow);
} else {
finishedFlows.put(getFlowCount(), flow);
}
currentFlows.remove(id);
// Backward Flow Finished.
} else {
logger.info("Backwards flow closed due to FIN Flag");
flow.updateActiveIdleTime(currentTimestamp,this.flowActivityTimeOut);
flow.addPacket(packet);
currentFlows.put(id,flow);
}
}else{
// some error
// TODO: review what to do with the packet
logger.warn("Backward flow received {} FIN packets", flow.getBwdFINFlags());
}
}
// Flow finished due RST flag (tcp only):
// 1.- we add the packet-in-process to the flow (it is the last packet)
// 2.- we move the flow to finished flow list
// 3.- we eliminate the flow from the current flow list
}else if(packet.hasFlagFIN()){
logger.debug("FlagFIN current has {} flow",currentFlows.size());
flow.addPacket(packet);
// 3.- we eliminate the flow from the current flow list
}else if(packet.hasFlagRST()){
logger.debug("FlagRST current has {} flow",currentFlows.size());
flow.addPacket(packet);
if (mListener != null) {
mListener.onFlowGenerated(flow);
}
else {
} else {
finishedFlows.put(getFlowCount(), flow);
}
currentFlows.remove(id);
currentFlows.remove(id);
}else{
flow.updateActiveIdleTime(currentTimestamp,this.flowActivityTimeOut);
flow.addPacket(packet);
currentFlows.put(id,flow);
//
// Forward Flow and fwdFIN = 0
//
if (Arrays.equals(flow.getSrc(), packet.getSrc()) && (flow.getFwdFINFlags() == 0)) {
flow.updateActiveIdleTime(currentTimestamp,this.flowActivityTimeOut);
flow.addPacket(packet);
currentFlows.put(id,flow);
//
// Backward Flow and bwdFIN = 0
//
} else if (flow.getBwdFINFlags() == 0) {
flow.updateActiveIdleTime(currentTimestamp,this.flowActivityTimeOut);
flow.addPacket(packet);
currentFlows.put(id,flow);
//
// FLOW already closed!!!
//
} else {
logger.warn("FLOW already closed! fwdFIN {} bwdFIN {}", flow.getFwdFINFlags(), flow.getBwdFINFlags());
// TODO: we just discard the packet?
}
}
}else{
currentFlows.put(packet.fwdFlowId(), new BasicFlow(bidirectional,packet, this.flowActivityTimeOut));
Expand Down