Changeset 6646

Timestamp:

06/18/09 17:15:31 (15 months ago)

Author:

metamorph68

Message:

Backported new parameter for on_connect handlers in input.harbor

Location:

branches/bugfix-0.9.1

Files:

• CHANGES (modified) (1 diff)
• src/sources/harbor_input.ml (modified) (3 diffs, 1 prop)

branches/bugfix-0.9.1/CHANGES

@@ -12 +12 @@
  - Get a node's striping status when stripping
    blank with strip_blank (#260).
+ - on_connect function for input.harbor now receives the
+   list of headers given by the connected source (#266).
 
 0.9.0 (01-03-2009)

branches/bugfix-0.9.1/src/sources/harbor_input.ml

@@ -166 +166 @@
     if relaying then self#disconnect
 
-  method relay socket =
+  method relay (headers:(string*string) list) socket =
     relaying <- true ;
-    on_connect () ;
+    let headers = List.map (fun (x,y) -> String.lowercase x,y) headers in
+    on_connect headers ;
     begin match dumpfile with
       | Some f ->
@@ -218 +219 @@
         Some "Maximum duration of the buffered data.";
 
-        "on_connect", Lang.fun_t [] Lang.unit_t,
-        Some (Lang.val_cst_fun [] Lang.unit),
-        Some "Functions to excecute when a source is connected";
+        "on_connect", Lang.fun_t 
+        [false,"",Lang.list_t (Lang.product_t Lang.string_t Lang.string_t)] Lang.unit_t,
+        Some (Lang.val_cst_fun 
+          ["","headers",None] Lang.unit),
+        Some "Function to execute when a source is connected. \
+              Its receives the list of headers, of the form: \
+              (\"label\",\"value\"). All labels are lowercase.";
 
         "on_disconnect",Lang.fun_t [] Lang.unit_t,
@@ -309 +314 @@
          let bufferize = Lang.to_float (List.assoc "buffer" p) in
          let max = Lang.to_float (List.assoc "max" p) in
-         let on_connect () =
-           ignore (Lang.apply (List.assoc "on_connect" p) [])
+         let on_connect l =
+           let l = 
+             List.map 
+              (fun (x,y) -> Lang.product (Lang.string x) (Lang.string y))
+              l
+           in
+           let arg = Lang.list l in
+           ignore (Lang.apply (List.assoc "on_connect" p) ["",arg])
          in
          let on_disconnect = fun () -> ignore (Lang.apply