Changeset 73

Timestamp:

04/10/08 16:44:28 (8 months ago)

Author:

root

Message:

Serve policy file from server to make new flash clients happy. Also formatting fixes using perltidy and line lenght of 140

Files:

• trunk/op_server.pl (modified) (23 diffs)

trunk/op_server.pl

@@ -1847 +1847 @@
-    # a trunk button.
-
-
+
+
-
-    if ( $canalid eq "" ) {
@@ -3035 +3036 @@
-                my $indice = $hash_temporal{Uniqueid} . "-" . $hash_temporal{Server};
-                if ( exists( $datos{"$indice"} ) ) {
-
+
+
-                    if ( defined( $datos{$indice}{Extension} ) ) {
-
@@ -3048 +3050 @@
-                }
-                else {
-
+
+
-                    print_datos(99);
-                    $pending_uniqueid_attendant{ $hash_temporal{Uniqueid} } = $hash_temporal{Exten} . "@" . $hash_temporal{Context};
@@ -3764 +3767 @@
-            $channel_to_agent{"$server^$canalreal"}   = "Agent/$texto";
-            $agent_to_channel{"$server^Agent/$texto"} = $canalreal;
-
+
+
-            if ( !defined( $hash_temporal{Fake} ) || $hash_temporal{Fake} ne "init" ) {
-                my @respuestas = set_queueobject( $server, "AGENT/$texto", "status", 1 );
@@ -3924 +3928 @@
-            $estado_final = "changelabel" . $change_led;
-
-
+
+
+
-                if ( defined( $agent_to_channel{"$server^Agent/$canal"} ) ) {
-                    $canal = $agent_to_channel{"$server^Agent/$canal"};
@@ -3996 +4002 @@
-            if ( defined( $hash_temporal{Queue} ) ) {
-                $valor = $hash_temporal{Queue};
-
+
+
+
-                    my $texto3 = "";
-                    foreach my $qmem ( @{ $agents_available_on_queue{"$server^$valor"} } ) {
@@ -4708 +4716 @@
-
-        if ( $nuevo_nombre =~ /<ZOMBIE>/ ) {
-
+
+
-            my ( $canalnuevo, undef ) = separate_session_from_channel($nuevo_nombre);
-            push @return, "$canalnuevo|corto||$unico_id|$nuevo_nombre";
@@ -4941 +4950 @@
-
-        # If its a new extension without state and priority 1, defaults to 'Up' and set setlid
+        if ( !defined( $hash_temporal{'Priority'} ) ) {
+            $hash_temporal{'Priority'} = 1;
+        }
-        if ( !defined( $datos{$unico_id}{'State'} ) && $hash_temporal{Priority} == 1 ) {
-            $datos{$unico_id}{'State'} = "Up";
@@ -5864 +5876 @@
-
-                                log_debug( "$heading CORTO interno $interno canal $canal", 256 ) if DEBUG;
+                                $dos = $canalid;
-
-                                delete $botonpark{$interno};
@@ -6162 +6175 @@
-                            if ( !defined( $cambiaron{$interno} ) ) {
-                                $cambiaron{$interno} = 1;
-
+
+
-                            }
-                        }
@@ -6172 +6186 @@
-
-                        if ( @{ $sesbot{$interno} } > 0 && $quehace eq 'corto' ) {
-
+
+
-                            if ( defined( $group_count{$interno} ) ) {
-                                if ( $group_count{$interno} == 1 ) {
@@ -6185 +6200 @@
-                                my $canalsincontexto = $canal;
-                                $canalsincontexto =~ s/(.*)&(.*)/$1/g;
-corto!
+$canalid
-                                if ( defined( $group_count{$interno} ) ) {
-                                    if ( $group_count{$interno} == 1 ) {
@@ -6206 +6221 @@
-                                push @mensajefinal, "$interno|settimer|0\@STOP";
-                                push @mensajefinal, "$interno|settext|";
-
+$canalid
-                            }
-
@@ -6263 +6278 @@
-                                            else {
-                                                push @respuestas, "$interno|$quehace2|$dos";
-
+
+
-                                            }
-                                        }
@@ -6342 +6358 @@
-                                        $iniagent = $channel_to_agent{"$server^$canalsincontexto"};
-                                    }
-
+
+
-                                    $botontimer{$interno}     = time();
-                                    $botontimertype{$interno} = "IDLE";
@@ -6355 +6372 @@
-                                else {
-                                    my $valip = "";
-
+
+
-
-                                    push @mensajefinal, "$interno|settimer|0\@STOP";
@@ -6366 +6384 @@
-                                        if ( defined( $botonpermanenttext{$interno} ) ) {
-                                            push @mensajefinal, "$interno|settext|$botonpermanenttext{$interno}";
-
+
+
-                                        }
-                                        $botonclid{$interno} = "";
@@ -6426 +6445 @@
-                                    if ( $cambiaron{$interno} == 1 ) {
-                                        foreach (@mensajefinal) {
-
+
+
-                                            push @respuestas, $_;
-                                        }
@@ -6717 +6737 @@
-
-# Tries to open the listening socket
-
+
+
+
+
+
+
+
-  or die "\nCan't listen to port $listen_port\n";
-$O = new IO::Select();
@@ -6974 +7000 @@
-                                        send_initial_status($C);
-                                    }
+                                    elsif ( $bloque_final =~ /<policy-file-request\/>/ ) {
+                                        send_policy_to_flash($C);
+                                    }
-                                    else {
-
+
+
-
-                                        # No Event in the block. Lets clear it up...
@@ -7127 +7157 @@
-        @cuales_transferir = extraer_todos_los_enlaces_de_un_canal( $origin_channel, $button_server{$datosflash} );
-        if ( @cuales_transferir == 0 ) {
-
+
+
-            if ( $sesbot{$datosflash} ) {
-                if ( @{ $sesbot{$datosflash} } ) {
@@ -7944 +7975 @@
-                    }
-
-
+
+
-                    my $keyext = "$origin_server^$origin_channel";
-
@@ -9018 +9050 @@
-}
-
+sub send_policy_to_flash {
+    my $socket = shift;
+    if ( !defined($socket) ) {
+        log_debug( "POLICY socket $socket not open!!!", 64 ) if DEBUG;
+    }
+    my $policy =
+"<?xml version=\"1.0\"?>\r\n<!DOCTYPE cross-domain-policy SYSTEM \"http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd\">\r\n<cross-domain-policy>\r\n<allow-access-from domain=\"*\" to-ports=\"$listen_port\" />\r\n</cross-domain-policy>\r\n\0";
+    actual_syswrite( $socket, $policy, "isclient", "policy enviado\n" );
+}
+
-sub send_status_to_flash {
-    my $socket       = shift;