Merge pull request #23 from ajragusa/master

ISSUE=10116 fixes for the is_loopback bug along with bumping version num...

app/Makefile

@@ -1,5 +1,5 @@
 NAME= oess-core
-VERSION = 1.1.5
+VERSION = 1.1.5a
 
 rpm:	dist
 	rpmbuild -ta dist/$(NAME)-$(VERSION).tar.gz

app/oess-core.spec

@@ -1,6 +1,6 @@
 Name:		oess-core		
 Version:	1.1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The core oess service provides
 
 Group:		Network
@@ -18,7 +18,7 @@ Requires(interp): /bin/sh
 Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 rpmlib(PayloadFilesHavePrefix) <= 4.0-1
 Requires(post): /bin/sh
 Requires: /bin/bash /usr/bin/perl perl(CGI) perl(DBI) perl(Data::Dumper) perl(English) perl(FindBin) perl(Getopt::Long) perl(Getopt::Std) perl(HTML::Entities) perl(LockFile::Simple) perl(Net::DBus) perl(Net::DBus::Exporter) perl(Proc::Daemon) perl(RRDs) perl(Socket) perl(Switch) perl(Sys::Hostname) perl(Sys::Syslog) perl(URI::Escape) perl(XML::Simple) perl(XML::Writer) perl(XML::XPath) perl(base) perl(constant) perl(strict) perl(warnings) perl(Term::ReadKey) perl(CPAN)
-Requires: perl-OESS >= 1.1.5
+Requires: perl-OESS >= 1.1.5a
 BuildArch:	noarch
 AutoreqProv: no
 %description

frontend/Makefile

@@ -1,5 +1,5 @@
 NAME= oess-frontend
-VERSION = 1.1.5
+VERSION = 1.1.5a
 
 rpm:	dist
 	rpmbuild -ta dist/$(NAME)-$(VERSION).tar.gz

frontend/oess-frontend.spec

@@ -1,6 +1,6 @@
 Name:		oess-frontend
 Version:	1.1.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The core oess service provides
 
 Group:		Network
@@ -10,7 +10,7 @@ Source0:	%{name}-%{version}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	perl
-Requires:	perl-OESS >= 1.1.5, perl(Net::DBus),dbus,dbus-libs,mysql-server,oess-core
+Requires:	perl-OESS >= 1.1.5a, perl(Net::DBus),dbus,dbus-libs,mysql-server,oess-core
 Requires:       nox >= 0.10.5
 Requires:       yui2
 Requires:       httpd, mod_ssl

perl-lib/OESS/lib/OESS/Database.pm

@@ -31,11 +31,11 @@ OESS::Database - Database Interaction Module
 
 =head1 VERSION
 
-Version 1.1.5
+Version 1.1.5a
 
 =cut
 
-our $VERSION = '1.1.5';
+our $VERSION = '1.1.5a';
 
 =head1 SYNOPSIS
 
@@ -81,7 +81,7 @@ use OESS::Topology;
 use DateTime;
 use Data::Dumper;
 
-use constant VERSION => '1.1.5';
+use constant VERSION => '1.1.5a';
 use constant MAX_VLAN_TAG => 4096;
 use constant MIN_VLAN_TAG => 1;
 use constant SHARE_DIR => "/usr/share/doc/perl-OESS-" . VERSION . "/";

perl-lib/OESS/lib/OESS/Topology.pm

@@ -290,17 +290,20 @@ sub is_loopback {
     # first ensure there are only two endpoints
     return 0 if(@$endpoints != 2);
 
+    my $node;
     my $intf; # keeps the name of our interface
     my $known_vlans = {}; # hash of vlans we've used in our endpoints
     foreach my $endpoint (@$endpoints){
         if(!%$known_vlans && !defined($intf)){
             $intf = $endpoint->{'interface'};
             $known_vlans->{$endpoint->{'tag'}} = 1;
+            $node = $endpoint->{'node'};
         }else {
             # if our endpoints are not all on the same interface this is not a valid loopback path
             return 0 if($intf ne $endpoint->{'interface'});
             # if we have used the same vlan tag twice this is not a valid loopback path
             return 0 if(defined($known_vlans->{$endpoint->{'tag'}}));
+            return 0 if($node ne $endpoint->{'node'});
         }
     }
 

perl-lib/OESS/perl-OESS.spec

@@ -1,7 +1,7 @@
 Summary: OESS Perl Libraries
 Name: perl-OESS
-Version: 1.1.5
-Release: 8
+Version: 1.1.5a
+Release: 1
 License: APL 2.0
 Group: Network
 URL: http://globalnoc.iu.edu

perl-lib/OSCARS/lib/OSCARS/Client.pm

@@ -26,6 +26,7 @@
 
 package OSCARS::Client;
 
+$ENV{CRYPT_SSLEAY_CIPHER} = 'ALL';
 use strict;
 use warnings;
 use LWP::UserAgent;

perl-lib/OSCARS/lib/OSCARS/pss.pm

@@ -16,6 +16,7 @@ use constant FWDCTL_SUCCESS     => 1;
 use constant FWDCTL_FAILURE     => 0;
 use constant FWDCTL_UNKNOWN     => 3;
 
+$ENV{CRYPT_SSLEAY_CIPHER} = 'ALL';
 $ENV{HTTPS_DEBUG}     = 0;
 $ENV{HTTPS_VERSION}   = '3';