Skip to content

Commit 290c0f5

Browse files
author
Dr. Brandon Wiley
committed
Added offset sequences command
1 parent a8ab86e commit 290c0f5

4 files changed

Lines changed: 25 additions & 7 deletions

File tree

AdversaryLabSwift.xcodeproj/project.pbxproj

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,11 +285,11 @@
285285
46D8511A201FE4B50052DF49 /* Products */ = {
286286
isa = PBXGroup;
287287
children = (
288-
46D85127201FE4B50052DF49 /* AdversaryLabSwiftPackageTests.xctest */,
289288
46D85129201FE4B50052DF49 /* AdversaryLabSwiftPackage */,
289+
46D85127201FE4B50052DF49 /* AdversaryLabSwiftPackageTests.xctest */,
290290
46D8512B201FE4B50052DF49 /* Auburn.framework */,
291-
46D8512D201FE4B50052DF49 /* RedShot.framework */,
292291
46D8512F201FE4B50052DF49 /* Datable.framework */,
292+
46D8512D201FE4B50052DF49 /* RedShot.framework */,
293293
);
294294
name = Products;
295295
sourceTree = "<group>";
@@ -370,7 +370,7 @@
370370
isa = PBXProject;
371371
attributes = {
372372
LastSwiftUpdateCheck = 0920;
373-
LastUpgradeCheck = 0920;
373+
LastUpgradeCheck = 0930;
374374
ORGANIZATIONNAME = "Operator Foundation";
375375
TargetAttributes = {
376376
4651A14C20083BF700037D31 = {
@@ -573,13 +573,15 @@
573573
CLANG_WARN_BOOL_CONVERSION = YES;
574574
CLANG_WARN_COMMA = YES;
575575
CLANG_WARN_CONSTANT_CONVERSION = YES;
576+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
576577
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
577578
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
578579
CLANG_WARN_EMPTY_BODY = YES;
579580
CLANG_WARN_ENUM_CONVERSION = YES;
580581
CLANG_WARN_INFINITE_RECURSION = YES;
581582
CLANG_WARN_INT_CONVERSION = YES;
582583
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
584+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
583585
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
584586
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
585587
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -630,13 +632,15 @@
630632
CLANG_WARN_BOOL_CONVERSION = YES;
631633
CLANG_WARN_COMMA = YES;
632634
CLANG_WARN_CONSTANT_CONVERSION = YES;
635+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
633636
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
634637
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
635638
CLANG_WARN_EMPTY_BODY = YES;
636639
CLANG_WARN_ENUM_CONVERSION = YES;
637640
CLANG_WARN_INFINITE_RECURSION = YES;
638641
CLANG_WARN_INT_CONVERSION = YES;
639642
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
643+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
640644
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
641645
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
642646
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

AdversaryLabSwift/Features/Sequences.swift

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import Foundation
1010
import Auburn
1111
import RedShot
12+
import Datable
1213

1314
func processOffsetSequences(forConnection connection: ObservedConnection) -> (processed: Bool, error: Error?)
1415
{
@@ -23,6 +24,12 @@ func processOffsetSequences(forConnection connection: ObservedConnection) -> (pr
2324
let outFloatingSequenceSet: RSortedSet<Data> = RSortedSet(key: connection.outgoingFloatingSequencesKey)
2425
let outCount = outFloatingSequenceSet.addSubsequences(sequence: outPacket)
2526
NSLog("Added \(outCount) outgoing subsequences")
27+
for offset in 0..<outPacket.count {
28+
let offsetKey = connection.outgoingOffsetSequencesKey + ":" + offset.string
29+
let outOffsetSequenceSet: RSortedSet<Data> = RSortedSet(key: offsetKey)
30+
let outOffCount = outOffsetSequenceSet.addSubsequences(sequence: outPacket)
31+
NSLog("Added \(outOffCount) outgoing subsequences for offset \(offset)")
32+
}
2633

2734
// Get the in packet that corresponds with this connection ID
2835
let inPacketHash: RMap<String, Data> = RMap(key: connection.incomingKey)
@@ -35,7 +42,13 @@ func processOffsetSequences(forConnection connection: ObservedConnection) -> (pr
3542
let inFloatingSequenceSet: RSortedSet<Data> = RSortedSet(key: connection.incomingFloatingSequencesKey)
3643
let inCount = inFloatingSequenceSet.addSubsequences(sequence: inPacket)
3744
NSLog("Added \(inCount) incoming subsequences")
38-
45+
for offset in 0..<inPacket.count {
46+
let offsetKey = connection.incomingOffsetSequencesKey + ":" + offset.string
47+
let inOffsetSequenceSet: RSortedSet<Data> = RSortedSet(key: offsetKey)
48+
let inOffCount = inOffsetSequenceSet.addSubsequences(sequence: inPacket)
49+
NSLog("Added \(inOffCount) incoming subsequences for offset \(offset)")
50+
}
51+
3952
return (true, nil)
4053
}
4154

AdversaryLabSwiftPackage/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AdversaryLabSwiftPackage/Package.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ let package = Package(
66
name: "AdversaryLabSwiftPackage",
77
dependencies: [
88
.package(url: "https://github.com/OperatorFoundation/Auburn.git", from: "0.1.14"),
9+
.package(url: "https://github.com/OperatorFoundation/Datable.git", from: "0.0.9"),
910
],
1011
targets: [
1112
.target(
1213
name: "AdversaryLabSwiftPackage",
13-
dependencies: ["Auburn"]),
14+
dependencies: ["Auburn", "Datable"]),
1415
.testTarget(
1516
name: "AdversaryLabSwiftPackageTests",
1617
dependencies: ["AdversaryLabSwiftPackage", "Auburn"]),

0 commit comments

Comments
 (0)