mirror of
https://git.robbyzambito.me/zaprus
synced 2026-05-06 14:20:37 +00:00
Compare commits
2 Commits
1f500b9b0a
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 91fdb2c6f8 | |||
| 7077aae9ce |
@@ -46,11 +46,11 @@ pub fn sendRelay(self: *Client, io: Io, payload: []const u8, dest: [4]u8) !void
|
||||
const rand = io_source.interface();
|
||||
|
||||
var headers: EthIpUdp = .{
|
||||
.src_mac = self.socket.mac,
|
||||
.src_mac = .fromBytes(self.socket.mac),
|
||||
.ip = .{
|
||||
.id = rand.int(u16),
|
||||
.src_addr = 0, //rand.int(u32),
|
||||
.dst_addr = @bitCast([_]u8{ 255, 255, 255, 255 }),
|
||||
.src_addr = .fromBytes(.{ 0, 0, 0, 0 }), //rand.int(u32),
|
||||
.dst_addr = .fromBytes(.{ 255, 255, 255, 255 }),
|
||||
.len = undefined,
|
||||
},
|
||||
.udp = .{
|
||||
@@ -86,11 +86,11 @@ pub fn connect(self: Client, io: Io, payload: []const u8) (error{ BpfAttachFaile
|
||||
const rand = io_source.interface();
|
||||
|
||||
var headers: EthIpUdp = .{
|
||||
.src_mac = self.socket.mac,
|
||||
.src_mac = .fromBytes(self.socket.mac),
|
||||
.ip = .{
|
||||
.id = rand.int(u16),
|
||||
.src_addr = 0, //rand.int(u32),
|
||||
.dst_addr = @bitCast([_]u8{ 255, 255, 255, 255 }),
|
||||
.src_addr = .fromBytes(.{ 0, 0, 0, 0 }), //rand.int(u32),
|
||||
.dst_addr = .fromBytes(.{ 255, 255, 255, 255 }),
|
||||
.len = undefined,
|
||||
},
|
||||
.udp = .{
|
||||
|
||||
@@ -14,6 +14,28 @@
|
||||
// You should have received a copy of the GNU General Public License along with
|
||||
// Zaprus. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
pub const IpAddr = packed struct {
|
||||
int: I,
|
||||
|
||||
const V = @Vector(4, u8);
|
||||
const I = u32;
|
||||
|
||||
pub fn fromBytes(s: V) IpAddr {
|
||||
return .{ .int = @bitCast(s) };
|
||||
}
|
||||
};
|
||||
|
||||
pub const MacAddr = packed struct {
|
||||
int: I,
|
||||
|
||||
const V = @Vector(6, u8);
|
||||
const I = @Int(.unsigned, @bitSizeOf(V));
|
||||
|
||||
pub fn fromBytes(s: V) MacAddr {
|
||||
return .{ .int = @bitCast(s) };
|
||||
}
|
||||
};
|
||||
|
||||
pub const EthIpUdp = packed struct(u336) { // 42 bytes * 8 bits = 336
|
||||
// --- UDP (Last in memory, defined first for LSB->MSB) ---
|
||||
udp: packed struct {
|
||||
@@ -25,8 +47,8 @@ pub const EthIpUdp = packed struct(u336) { // 42 bytes * 8 bits = 336
|
||||
|
||||
// --- IP ---
|
||||
ip: packed struct {
|
||||
dst_addr: u32,
|
||||
src_addr: u32,
|
||||
dst_addr: IpAddr,
|
||||
src_addr: IpAddr,
|
||||
header_checksum: u16 = 0,
|
||||
protocol: u8 = 17, // udp
|
||||
ttl: u8 = 0x40,
|
||||
@@ -53,8 +75,8 @@ pub const EthIpUdp = packed struct(u336) { // 42 bytes * 8 bits = 336
|
||||
|
||||
// --- Ethernet ---
|
||||
eth_type: u16 = std.os.linux.ETH.P.IP,
|
||||
src_mac: @Vector(6, u8),
|
||||
dst_mac: @Vector(6, u8) = @splat(0xff),
|
||||
src_mac: MacAddr,
|
||||
dst_mac: MacAddr = .fromBytes(@splat(0xff)),
|
||||
|
||||
pub fn toBytes(self: @This()) [336 / 8]u8 {
|
||||
var res: [336 / 8]u8 = undefined;
|
||||
|
||||
Reference in New Issue
Block a user