Changed pfctl parsing for new output format of 'pfctl -ss'

identproxy.rb

@@ -55,12 +55,12 @@ end
 # Look up function for NAT table
 def natlookup( p1, p2 )
 	# Execute shell command to get NAT table
-	nattable = %x(pfctl -ss | egrep '(>.*>|<.*<)')
+	nattable = %x( pfctl -ss | grep "\(" )
 
 	# Search NAT table for matching enties
-	if( nattable =~ /tcp (.+):(.+) -> (.+):#{p1} -> (.+):#{p2} / )
-		server = $1
-		p1 = $2.to_i
+	if( nattable =~ /tcp (.+):#{p1} \((.+):(.+)\) -> (.+):#{p2} / )
+		server = $2
+		p1 = $3.to_i
 		return [server, p1, p2]
 	else
 		return nil