From: Vincent Hanquez <vincent.hanquez@eu.citrix.com>
Date: Tue, 25 Aug 2009 16:55:17 +0000 (+0100)
Subject: replace - by _ in method name when using dbus to transport RPC.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ae0f2f9413ff3da346ee625f63280c80c11617fc;p=xenclient%2Ftoolstack.git

replace - by _ in method name when using dbus to transport RPC.
---

diff --git a/xenvm/xenvm.ml b/xenvm/xenvm.ml
index 989193c..abdc974 100644
--- a/xenvm/xenvm.ml
+++ b/xenvm/xenvm.ml
@@ -690,6 +690,7 @@ let monitor_rpc_dbus state =
 	let process_method_call msg =
 		let params = DBus.Message.get msg in
 		let msg_method = match DBus.Message.get_member msg with None -> "missingmethod" | Some m -> m in
+		let msg_method = String.replace "_" "-" msg_method in
 		match params with
 		| [ DBus.Array DBus.Dicts ((_, _), msg_params) ] ->
 			let params = List.map (fun (k, v) ->
diff --git a/xenvm/xenvmlib.ml b/xenvm/xenvmlib.ml
index 0942da7..be2f0e6 100644
--- a/xenvm/xenvmlib.ml
+++ b/xenvm/xenvmlib.ml
@@ -173,6 +173,7 @@ let request ?timeout id query =
 	let dest = intf in
 
 	let method_name, params = query in
+	let method_name = String.replace "-" "_" method_name in
 	let msg = DBus.Message.new_method_call dest "/" intf method_name in
 	let params = List.map (fun (k, v) -> DBus.String k, DBus.String v) params in
 	DBus.Message.append msg [ DBus.Array (DBus.Dicts ((DBus.SigString, DBus.SigString), params)) ];