mirror of
https://github.com/solemnwarning/ipxwrapper
synced 2024-12-30 16:45:37 +01:00
Add more DOXBox encapsulation tests.
This commit is contained in:
Daniel Collins
parent
ad1023b376
commit
a91e05c11b
@ -37,11 +37,6 @@ our ($remote_mac_b, $remote_ip_b);
|
|||||||
our ($net_a_bcast, $net_b_bcast);
|
our ($net_a_bcast, $net_b_bcast);
|
||||||
our ($dosbox_port);
|
our ($dosbox_port);
|
||||||
|
|
||||||
require "$FindBin::Bin/ptype.pm";
|
|
||||||
|
|
||||||
our $ptype_send_func;
|
|
||||||
our $ptype_capture_class;
|
|
||||||
|
|
||||||
describe "IPXWrapper using DOSBox UDP encapsulation" => sub
|
describe "IPXWrapper using DOSBox UDP encapsulation" => sub
|
||||||
{
|
{
|
||||||
my $dosbox_server;
|
my $dosbox_server;
|
||||||
@ -52,7 +47,11 @@ describe "IPXWrapper using DOSBox UDP encapsulation" => sub
|
|||||||
reg_set_dword( $remote_ip_a, "HKCU\\Software\\IPXWrapper", "use_pcap", ENCAP_TYPE_DOSBOX);
|
reg_set_dword( $remote_ip_a, "HKCU\\Software\\IPXWrapper", "use_pcap", ENCAP_TYPE_DOSBOX);
|
||||||
reg_set_string($remote_ip_a, "HKCU\\Software\\IPXWrapper", "dosbox_server_addr", $local_ip_a);
|
reg_set_string($remote_ip_a, "HKCU\\Software\\IPXWrapper", "dosbox_server_addr", $local_ip_a);
|
||||||
reg_set_dword( $remote_ip_a, "HKCU\\Software\\IPXWrapper", "dosbox_server_port", $dosbox_port);
|
reg_set_dword( $remote_ip_a, "HKCU\\Software\\IPXWrapper", "dosbox_server_port", $dosbox_port);
|
||||||
|
};
|
||||||
|
|
||||||
|
before each => sub
|
||||||
|
{
|
||||||
|
$dosbox_server = undef;
|
||||||
$dosbox_server = IPXWrapper::DOSBoxServer->new($dosbox_port);
|
$dosbox_server = IPXWrapper::DOSBoxServer->new($dosbox_port);
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -61,119 +60,346 @@ describe "IPXWrapper using DOSBox UDP encapsulation" => sub
|
|||||||
$dosbox_server = undef;
|
$dosbox_server = undef;
|
||||||
};
|
};
|
||||||
|
|
||||||
it "handles unicast packets from the server" => sub
|
describe "a single process" => sub
|
||||||
{
|
{
|
||||||
my $capture_a = IPXWrapper::Tool::IPXRecv->new(
|
it "handles unicast packets from the server" => sub
|
||||||
$remote_ip_a,
|
{
|
||||||
"-b", "-r", "00:00:00:00", "00:00:00:00:00:00", "4444",
|
my $capture_a = IPXWrapper::Tool::IPXRecv->new(
|
||||||
);
|
$remote_ip_a,
|
||||||
|
"-b", "00:00:00:00", "00:00:00:00:00:00", "4444",
|
||||||
my $client = IPXWrapper::DOSBoxClient->new($local_ip_a, $dosbox_port);
|
);
|
||||||
|
|
||||||
note("Their node number is ".$capture_a->node());
|
|
||||||
note("My node number is ".$client->node());
|
|
||||||
|
|
||||||
$client->send(
|
|
||||||
tc => 0,
|
|
||||||
type => 0,
|
|
||||||
|
|
||||||
dest_network => "00:00:00:00",
|
my $client = IPXWrapper::DOSBoxClient->new($local_ip_a, $dosbox_port);
|
||||||
dest_node => $capture_a->node(),
|
|
||||||
dest_socket => 4444,
|
|
||||||
|
|
||||||
src_network => $client->net(),
|
note("Their node number is ".$capture_a->node());
|
||||||
src_node => $client->node(),
|
note("My node number is ".$client->node());
|
||||||
src_socket => 1234,
|
|
||||||
|
|
||||||
data => "damage",
|
$client->send(
|
||||||
);
|
tc => 0,
|
||||||
|
type => 0,
|
||||||
sleep(1);
|
|
||||||
|
dest_network => "00:00:00:00",
|
||||||
my @packets_a = $capture_a->kill_and_read();
|
dest_node => $capture_a->node(),
|
||||||
|
dest_socket => 4444,
|
||||||
cmp_hashes_partial(\@packets_a, [
|
|
||||||
{
|
src_network => $client->net(),
|
||||||
src_network => "00:00:00:00",
|
|
||||||
src_node => $client->node(),
|
src_node => $client->node(),
|
||||||
src_socket => 1234,
|
src_socket => 1234,
|
||||||
|
|
||||||
data => "damage",
|
data => "damage",
|
||||||
},
|
);
|
||||||
]);
|
|
||||||
};
|
|
||||||
|
|
||||||
it "handles broadcast packets from the server" => sub
|
|
||||||
{
|
|
||||||
my $capture_a = IPXWrapper::Tool::IPXRecv->new(
|
|
||||||
$remote_ip_a,
|
|
||||||
"-b", "-r", "00:00:00:00", "00:00:00:00:00:00", "4444",
|
|
||||||
);
|
|
||||||
|
|
||||||
my $client = IPXWrapper::DOSBoxClient->new($local_ip_a, $dosbox_port);
|
|
||||||
|
|
||||||
note("Their node number is ".$capture_a->node());
|
|
||||||
note("My node number is ".$client->node());
|
|
||||||
|
|
||||||
$client->send(
|
|
||||||
tc => 0,
|
|
||||||
type => 0,
|
|
||||||
|
|
||||||
dest_network => "00:00:00:00",
|
sleep(1);
|
||||||
dest_node => "FF:FF:FF:FF:FF:FF",
|
|
||||||
dest_socket => 4444,
|
|
||||||
|
|
||||||
src_network => $client->net(),
|
my @packets_a = $capture_a->kill_and_read();
|
||||||
src_node => $client->node(),
|
|
||||||
src_socket => 1234,
|
|
||||||
|
|
||||||
data => "location",
|
cmp_hashes_partial(\@packets_a, [
|
||||||
);
|
{
|
||||||
|
src_network => "00:00:00:00",
|
||||||
|
src_node => $client->node(),
|
||||||
|
src_socket => 1234,
|
||||||
|
|
||||||
|
data => "damage",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
|
||||||
sleep(1);
|
it "handles broadcast packets from the server" => sub
|
||||||
|
{
|
||||||
my @packets_a = $capture_a->kill_and_read();
|
my $capture_a = IPXWrapper::Tool::IPXRecv->new(
|
||||||
|
$remote_ip_a,
|
||||||
cmp_hashes_partial(\@packets_a, [
|
"-b", "00:00:00:00", "00:00:00:00:00:00", "4444",
|
||||||
{
|
);
|
||||||
src_network => "00:00:00:00",
|
|
||||||
|
my $client = IPXWrapper::DOSBoxClient->new($local_ip_a, $dosbox_port);
|
||||||
|
|
||||||
|
note("Their node number is ".$capture_a->node());
|
||||||
|
note("My node number is ".$client->node());
|
||||||
|
|
||||||
|
$client->send(
|
||||||
|
tc => 0,
|
||||||
|
type => 0,
|
||||||
|
|
||||||
|
dest_network => "00:00:00:00",
|
||||||
|
dest_node => "FF:FF:FF:FF:FF:FF",
|
||||||
|
dest_socket => 4444,
|
||||||
|
|
||||||
|
src_network => $client->net(),
|
||||||
src_node => $client->node(),
|
src_node => $client->node(),
|
||||||
src_socket => 1234,
|
src_socket => 1234,
|
||||||
|
|
||||||
data => "location",
|
data => "location",
|
||||||
},
|
);
|
||||||
]);
|
|
||||||
|
sleep(1);
|
||||||
|
|
||||||
|
my @packets_a = $capture_a->kill_and_read();
|
||||||
|
|
||||||
|
cmp_hashes_partial(\@packets_a, [
|
||||||
|
{
|
||||||
|
src_network => "00:00:00:00",
|
||||||
|
src_node => $client->node(),
|
||||||
|
src_socket => 1234,
|
||||||
|
|
||||||
|
data => "location",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
|
||||||
|
it "sends unicast packets to server" => sub
|
||||||
|
{
|
||||||
|
my $client = IPXWrapper::DOSBoxClient->new($local_ip_a, $dosbox_port);
|
||||||
|
|
||||||
|
note("My node number is ".$client->node());
|
||||||
|
|
||||||
|
run_remote_cmd(
|
||||||
|
$remote_ip_a, "Z:\\tools\\ipx-send.exe",
|
||||||
|
"-d" => "tasty",
|
||||||
|
"-s" => "5555",
|
||||||
|
"00:00:00:00", $client->node(), "4444",
|
||||||
|
);
|
||||||
|
|
||||||
|
sleep(1);
|
||||||
|
|
||||||
|
my @packets = $client->recv_any();
|
||||||
|
|
||||||
|
cmp_hashes_partial(\@packets, [
|
||||||
|
{
|
||||||
|
src_network => "00:00:00:00",
|
||||||
|
src_socket => 5555,
|
||||||
|
|
||||||
|
dest_network => "00:00:00:00",
|
||||||
|
dest_node => $client->node(),
|
||||||
|
dest_socket => 4444,
|
||||||
|
|
||||||
|
data => "tasty",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
it "sends unicast packets to server" => sub
|
describe "concurrent processes" => sub
|
||||||
{
|
{
|
||||||
my $client = IPXWrapper::DOSBoxClient->new($local_ip_a, $dosbox_port);
|
they "recieve direct unicast packets from another machine" => sub
|
||||||
|
{
|
||||||
note("My node number is ".$client->node());
|
my $capture_a = IPXWrapper::Tool::IPXRecv->new(
|
||||||
|
$remote_ip_a,
|
||||||
run_remote_cmd(
|
"00:00:00:00", "00:00:00:00:00:00", "4444",
|
||||||
$remote_ip_a, "Z:\\tools\\ipx-send.exe",
|
);
|
||||||
"-d" => "tasty",
|
|
||||||
"-s" => "5555",
|
my $capture_b = IPXWrapper::Tool::IPXRecv->new(
|
||||||
"00:00:00:00", $client->node(), "4444",
|
$remote_ip_a,
|
||||||
);
|
"00:00:00:00", "00:00:00:00:00:00", "4445",
|
||||||
|
);
|
||||||
sleep(1);
|
|
||||||
|
my $client = IPXWrapper::DOSBoxClient->new($local_ip_a, $dosbox_port);
|
||||||
my @packets = $client->recv_any();
|
|
||||||
|
note("\$capture_a address is ".$capture_a->net()."/".$capture_a->node());
|
||||||
cmp_hashes_partial(\@packets, [
|
note("\$capture_b address is ".$capture_b->net()."/".$capture_b->node());
|
||||||
{
|
note("My address is ".$client->net()."/".$client->node());
|
||||||
src_network => "00:00:00:00",
|
|
||||||
src_socket => 5555,
|
$client->send(
|
||||||
|
tc => 0,
|
||||||
|
type => 0,
|
||||||
|
|
||||||
dest_network => "00:00:00:00",
|
dest_network => $capture_a->net(),,
|
||||||
dest_node => $client->node(),
|
dest_node => $capture_a->node(),
|
||||||
dest_socket => 4444,
|
dest_socket => 4444,
|
||||||
|
|
||||||
data => "tasty",
|
src_network => $client->net(),
|
||||||
},
|
src_node => $client->node(),
|
||||||
]);
|
src_socket => 1234,
|
||||||
|
|
||||||
|
data => "full",
|
||||||
|
);
|
||||||
|
|
||||||
|
$client->send(
|
||||||
|
tc => 0,
|
||||||
|
type => 0,
|
||||||
|
|
||||||
|
dest_network => $capture_b->net(),,
|
||||||
|
dest_node => $capture_b->node(),
|
||||||
|
dest_socket => 4445,
|
||||||
|
|
||||||
|
src_network => $client->net(),
|
||||||
|
src_node => $client->node(),
|
||||||
|
src_socket => 1234,
|
||||||
|
|
||||||
|
data => "accent",
|
||||||
|
);
|
||||||
|
|
||||||
|
sleep(1);
|
||||||
|
|
||||||
|
my @packets_a = $capture_a->kill_and_read();
|
||||||
|
my @packets_b = $capture_b->kill_and_read();
|
||||||
|
|
||||||
|
cmp_hashes_partial(\@packets_a, [
|
||||||
|
{
|
||||||
|
src_network => $client->net(),
|
||||||
|
src_node => $client->node(),
|
||||||
|
src_socket => 1234,
|
||||||
|
|
||||||
|
data => "full",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
cmp_hashes_partial(\@packets_b, [
|
||||||
|
{
|
||||||
|
src_network => $client->net(),
|
||||||
|
src_node => $client->node(),
|
||||||
|
src_socket => 1234,
|
||||||
|
|
||||||
|
data => "accent",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
|
||||||
|
they "recieve direct unicast packets from each other" => sub
|
||||||
|
{
|
||||||
|
my $capture_a = IPXWrapper::Tool::IPXISR->new(
|
||||||
|
$remote_ip_a,
|
||||||
|
"00:00:00:00", "00:00:00:00:00:00", "4444",
|
||||||
|
);
|
||||||
|
|
||||||
|
my $capture_b = IPXWrapper::Tool::IPXISR->new(
|
||||||
|
$remote_ip_a,
|
||||||
|
"00:00:00:00", "00:00:00:00:00:00", "4445",
|
||||||
|
);
|
||||||
|
|
||||||
|
note("\$capture_a address is ".$capture_a->net()."/".$capture_a->node());
|
||||||
|
note("\$capture_b address is ".$capture_b->net()."/".$capture_b->node());
|
||||||
|
|
||||||
|
$capture_a->send($capture_b->net(), $capture_b->node(), 4445, "reader");
|
||||||
|
$capture_b->send($capture_a->net(), $capture_a->node(), 4444, "earwax");
|
||||||
|
|
||||||
|
sleep(1);
|
||||||
|
|
||||||
|
my @packets_a = $capture_a->kill_and_read();
|
||||||
|
my @packets_b = $capture_b->kill_and_read();
|
||||||
|
|
||||||
|
cmp_hashes_partial(\@packets_a, [
|
||||||
|
{
|
||||||
|
src_net => $capture_b->net(),
|
||||||
|
src_node => $capture_b->node(),
|
||||||
|
src_socket => 4445,
|
||||||
|
|
||||||
|
data => "earwax",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
cmp_hashes_partial(\@packets_b, [
|
||||||
|
{
|
||||||
|
src_net => $capture_a->net(),
|
||||||
|
src_node => $capture_a->node(),
|
||||||
|
src_socket => 4444,
|
||||||
|
|
||||||
|
data => "reader",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
|
||||||
|
they "recieve broadcast packets from another machine" => sub
|
||||||
|
{
|
||||||
|
my $capture_a = IPXWrapper::Tool::IPXRecv->new(
|
||||||
|
$remote_ip_a,
|
||||||
|
"-r", "-b", "00:00:00:00", "00:00:00:00:00:00", "4444",
|
||||||
|
);
|
||||||
|
|
||||||
|
my $capture_b = IPXWrapper::Tool::IPXRecv->new(
|
||||||
|
$remote_ip_a,
|
||||||
|
"-r", "-b", "00:00:00:00", "00:00:00:00:00:00", "4444",
|
||||||
|
);
|
||||||
|
|
||||||
|
my $client = IPXWrapper::DOSBoxClient->new($local_ip_a, $dosbox_port);
|
||||||
|
|
||||||
|
note("\$capture_a address is ".$capture_a->net()."/".$capture_a->node());
|
||||||
|
note("\$capture_b address is ".$capture_b->net()."/".$capture_b->node());
|
||||||
|
note("My address is ".$client->net()."/".$client->node());
|
||||||
|
|
||||||
|
$client->send(
|
||||||
|
tc => 0,
|
||||||
|
type => 0,
|
||||||
|
|
||||||
|
dest_network => "FF:FF:FF:FF",
|
||||||
|
dest_node => "FF:FF:FF:FF:FF:FF",
|
||||||
|
dest_socket => 4444,
|
||||||
|
|
||||||
|
src_network => $client->net(),
|
||||||
|
src_node => $client->node(),
|
||||||
|
src_socket => 1234,
|
||||||
|
|
||||||
|
data => "cylinder",
|
||||||
|
);
|
||||||
|
|
||||||
|
sleep(1);
|
||||||
|
|
||||||
|
my @packets_a = $capture_a->kill_and_read();
|
||||||
|
my @packets_b = $capture_b->kill_and_read();
|
||||||
|
|
||||||
|
cmp_hashes_partial(\@packets_a, [
|
||||||
|
{
|
||||||
|
src_network => $client->net(),
|
||||||
|
src_node => $client->node(),
|
||||||
|
src_socket => 1234,
|
||||||
|
|
||||||
|
data => "cylinder",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
cmp_hashes_partial(\@packets_b, [
|
||||||
|
{
|
||||||
|
src_network => $client->net(),
|
||||||
|
src_node => $client->node(),
|
||||||
|
src_socket => 1234,
|
||||||
|
|
||||||
|
data => "cylinder",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
};
|
||||||
|
|
||||||
|
they "recieve broadcast packets from each other" => sub
|
||||||
|
{
|
||||||
|
my $capture_a = IPXWrapper::Tool::IPXISR->new(
|
||||||
|
$remote_ip_a,
|
||||||
|
"-r", "-b", "00:00:00:00", "00:00:00:00:00:00", "4444",
|
||||||
|
);
|
||||||
|
|
||||||
|
my $capture_b = IPXWrapper::Tool::IPXISR->new(
|
||||||
|
$remote_ip_a,
|
||||||
|
"-r", "-b", "00:00:00:00", "00:00:00:00:00:00", "4444",
|
||||||
|
);
|
||||||
|
|
||||||
|
note("\$capture_a address is ".$capture_a->net()."/".$capture_a->node());
|
||||||
|
note("\$capture_b address is ".$capture_b->net()."/".$capture_b->node());
|
||||||
|
|
||||||
|
$capture_a->send($capture_a->net(), "FF:FF:FF:FF:FF:FF", 4444, "export");
|
||||||
|
$capture_b->send($capture_b->net(), "FF:FF:FF:FF:FF:FF", 4444, "addicted");
|
||||||
|
|
||||||
|
sleep(1);
|
||||||
|
|
||||||
|
my @packets_a = $capture_a->kill_and_read();
|
||||||
|
my @packets_b = $capture_b->kill_and_read();
|
||||||
|
|
||||||
|
cmp_hashes_partial(\@packets_a, [
|
||||||
|
{
|
||||||
|
src_net => $capture_b->net(),
|
||||||
|
src_node => $capture_b->node(),
|
||||||
|
src_socket => 4444,
|
||||||
|
|
||||||
|
data => "addicted",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
cmp_hashes_partial(\@packets_b, [
|
||||||
|
{
|
||||||
|
src_net => $capture_a->net(),
|
||||||
|
src_node => $capture_a->node(),
|
||||||
|
src_socket => 4444,
|
||||||
|
|
||||||
|
data => "export",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# IPXWrapper test suite
|
# IPXWrapper test suite
|
||||||
# Copyright (C) 2014 Daniel Collins <solemnwarning@solemnwarning.net>
|
# Copyright (C) 2014-2023 Daniel Collins <solemnwarning@solemnwarning.net>
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify it
|
# This program is free software; you can redistribute it and/or modify it
|
||||||
# under the terms of the GNU General Public License version 2 as published by
|
# under the terms of the GNU General Public License version 2 as published by
|
||||||
@ -38,8 +38,6 @@ sub new
|
|||||||
pid => $pid,
|
pid => $pid,
|
||||||
in => $in,
|
in => $in,
|
||||||
out => $out,
|
out => $out,
|
||||||
|
|
||||||
sockets => {},
|
|
||||||
}, $class);
|
}, $class);
|
||||||
|
|
||||||
my $output = "";
|
my $output = "";
|
||||||
@ -50,8 +48,12 @@ sub new
|
|||||||
|
|
||||||
$line =~ s/[\r\n]//g;
|
$line =~ s/[\r\n]//g;
|
||||||
|
|
||||||
if($line eq "Ready")
|
if($line =~ m/^Ready (\S+) (\S+) (\S+)$/)
|
||||||
{
|
{
|
||||||
|
$self->{net} = $1;
|
||||||
|
$self->{node} = $2;
|
||||||
|
$self->{socket} = $3;
|
||||||
|
|
||||||
return $self;
|
return $self;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -69,6 +71,18 @@ sub DESTROY
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub net
|
||||||
|
{
|
||||||
|
my ($self) = @_;
|
||||||
|
return $self->{net};
|
||||||
|
}
|
||||||
|
|
||||||
|
sub node
|
||||||
|
{
|
||||||
|
my ($self) = @_;
|
||||||
|
return $self->{node};
|
||||||
|
}
|
||||||
|
|
||||||
sub _end
|
sub _end
|
||||||
{
|
{
|
||||||
my ($self) = @_;
|
my ($self) = @_;
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
/* IPXWrapper test tools
|
/* IPXWrapper test tools
|
||||||
* Copyright (C) 2014 Daniel Collins <solemnwarning@solemnwarning.net>
|
* Copyright (C) 2014-2023 Daniel Collins <solemnwarning@solemnwarning.net>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
* under the terms of the GNU General Public License version 2 as published by
|
* under the terms of the GNU General Public License version 2 as published by
|
||||||
@ -99,7 +99,18 @@ int main(int argc, char **argv)
|
|||||||
HANDLE send_thread_h = CreateThread(NULL, 0, &send_thread, &sock, 0, NULL);
|
HANDLE send_thread_h = CreateThread(NULL, 0, &send_thread, &sock, 0, NULL);
|
||||||
assert(send_thread_h != NULL);
|
assert(send_thread_h != NULL);
|
||||||
|
|
||||||
printf("Ready\n");
|
{
|
||||||
|
int addrlen = sizeof(local_addr);
|
||||||
|
assert(getsockname(sock, (struct sockaddr*)(&local_addr), &addrlen) == 0);
|
||||||
|
|
||||||
|
char net_s[ADDR32_STRING_SIZE];
|
||||||
|
addr32_string(net_s, addr32_in(local_addr.sa_netnum));
|
||||||
|
|
||||||
|
char node_s[ADDR48_STRING_SIZE];
|
||||||
|
addr48_string(node_s, addr48_in(local_addr.sa_nodenum));
|
||||||
|
|
||||||
|
printf("Ready %s %s %hu\n", net_s, node_s, ntohs(local_addr.sa_socket));
|
||||||
|
}
|
||||||
|
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
while(1)
|
while(1)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user