From e608cb00beee4b4b00f2cbe7abafd5c370396fc7 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Fri, 26 Feb 2016 12:03:18 -0500
Subject: [PATCH] move .pm to separate directory

Change-Id: I8811005463a50e429ad94fb6d28f41b936d85860
---
 {utils => perl}/DTLS.pm                      |  0
 {utils => perl}/ICE.pm                       |  0
 {utils => perl}/RTP.pm                       |  0
 perl/Rtpengine.pm                            | 58 ++++++++++++++++++++
 utils/Rtpengine.pm => perl/Rtpengine/Test.pm | 51 +----------------
 {utils => perl}/SDP.pm                       |  0
 {utils => perl}/SRTP.pm                      |  0
 utils/test-basic.pl                          |  2 +-
 utils/test-dtls.pl                           |  2 +-
 utils/test-ice.pl                            |  2 +-
 10 files changed, 63 insertions(+), 52 deletions(-)
 rename {utils => perl}/DTLS.pm (100%)
 rename {utils => perl}/ICE.pm (100%)
 rename {utils => perl}/RTP.pm (100%)
 create mode 100644 perl/Rtpengine.pm
 rename utils/Rtpengine.pm => perl/Rtpengine/Test.pm (87%)
 rename {utils => perl}/SDP.pm (100%)
 rename {utils => perl}/SRTP.pm (100%)

diff --git a/utils/DTLS.pm b/perl/DTLS.pm
similarity index 100%
rename from utils/DTLS.pm
rename to perl/DTLS.pm
diff --git a/utils/ICE.pm b/perl/ICE.pm
similarity index 100%
rename from utils/ICE.pm
rename to perl/ICE.pm
diff --git a/utils/RTP.pm b/perl/RTP.pm
similarity index 100%
rename from utils/RTP.pm
rename to perl/RTP.pm
diff --git a/perl/Rtpengine.pm b/perl/Rtpengine.pm
new file mode 100644
index 000000000..205b1966f
--- /dev/null
+++ b/perl/Rtpengine.pm
@@ -0,0 +1,58 @@
+package Rtpengine;
+
+use strict;
+use warnings;
+use Socket;
+use Socket6;
+use IO::Socket;
+use IO::Socket::IP;
+use Bencode;
+use Data::Dumper;
+
+sub new {
+	my ($class, $addr, $port) = @_;
+
+	my $self = {};
+	bless $self, $class;
+
+	if (ref($addr)) {
+		$self->{socket} = $addr;
+	}
+	else {
+		$self->{socket} = IO::Socket::IP->new(Type => &Socket::SOCK_DGRAM, Proto => 'udp',
+				PeerHost => $addr, PeerPort => $port);
+	}
+
+	return $self;
+}
+
+sub req {
+	my ($self, $packet) = @_;
+
+	my $cookie = rand() . ' ';
+	my $p = $cookie . Bencode::bencode($packet);
+	$self->{socket}->send($p, 0) or die $!;
+	my $ret;
+	$self->{socket}->recv($ret, 65535) or die $!;
+	$ret =~ s/^\Q$cookie\E//s or die $ret;
+	my $resp = Bencode::bdecode($ret, 1);
+
+	$resp->{result} or die Dumper $resp;
+
+	if ($resp->{result} eq 'error') {
+		die "Error reason: \"$resp->{'error-reason'}\"";
+	}
+
+	return $resp;
+}
+
+sub offer {
+	my ($self, $packet) = @_;
+	return $self->req( { %$packet, command => 'offer' } );
+}
+sub answer {
+	my ($self, $packet) = @_;
+	return $self->req( { %$packet, command => 'answer' } );
+}
+
+1;
diff --git a/utils/Rtpengine.pm b/perl/Rtpengine/Test.pm
similarity index 87%
rename from utils/Rtpengine.pm
rename to perl/Rtpengine/Test.pm
index 2b61670a8..6df033dc7 100644
--- a/utils/Rtpengine.pm
+++ b/perl/Rtpengine/Test.pm
@@ -1,4 +1,4 @@
-package Rtpengine;
+package Rtpengine::Test;
 
 use strict;
 use warnings;
@@ -16,54 +16,7 @@ use SDP;
 use ICE;
 use DTLS;
 use RTP;
-
-sub new {
-	my ($class, $addr, $port) = @_;
-
-	my $self = {};
-	bless $self, $class;
-
-	if (ref($addr)) {
-		$self->{socket} = $addr;
-	}
-	else {
-		$self->{socket} = IO::Socket::IP->new(Type => &Socket::SOCK_DGRAM, Proto => 'udp',
-				PeerHost => $addr, PeerPort => $port);
-	}
-
-	return $self;
-}
-
-sub req {
-	my ($self, $packet) = @_;
-
-	my $cookie = rand() . ' ';
-	my $p = $cookie . Bencode::bencode($packet);
-	$self->{socket}->send($p, 0) or die $!;
-	my $ret;
-	$self->{socket}->recv($ret, 65535) or die $!;
-	$ret =~ s/^\Q$cookie\E//s or die $ret;
-	my $resp = Bencode::bdecode($ret, 1);
-
-	$resp->{result} or die Dumper $resp;
-
-	if ($resp->{result} eq 'error') {
-		die "Error reason: \"$resp->{'error-reason'}\"";
-	}
-
-	return $resp;
-}
-
-sub offer {
-	my ($self, $packet) = @_;
-	return $self->req( { %$packet, command => 'offer' } );
-}
-sub answer {
-	my ($self, $packet) = @_;
-	return $self->req( { %$packet, command => 'answer' } );
-}
-
-package Rtpengine::Test;
+use Rtpengine;
 
 sub new {
 	my ($class) = @_;
diff --git a/utils/SDP.pm b/perl/SDP.pm
similarity index 100%
rename from utils/SDP.pm
rename to perl/SDP.pm
diff --git a/utils/SRTP.pm b/perl/SRTP.pm
similarity index 100%
rename from utils/SRTP.pm
rename to perl/SRTP.pm
diff --git a/utils/test-basic.pl b/utils/test-basic.pl
index 322be0bc2..2ad89a5e6 100644
--- a/utils/test-basic.pl
+++ b/utils/test-basic.pl
@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use Rtpengine;
+use Rtpengine::Test;
 
 my $r = Rtpengine::Test->new();
 my $a = $r->client();
diff --git a/utils/test-dtls.pl b/utils/test-dtls.pl
index b6e5fdb9c..0797bf886 100644
--- a/utils/test-dtls.pl
+++ b/utils/test-dtls.pl
@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use Rtpengine;
+use Rtpengine::Test;
 
 my $r = Rtpengine::Test->new();
 my $a = $r->client(dtls => 1);
diff --git a/utils/test-ice.pl b/utils/test-ice.pl
index be005ef60..31dbc2f8e 100644
--- a/utils/test-ice.pl
+++ b/utils/test-ice.pl
@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use Rtpengine;
+use Rtpengine::Test;
 
 my $r = Rtpengine::Test->new();
 my $a = $r->client(ice => 1);