This routine will parse iforward/oforward options for both qemu-vp and
the virtproxy chardev
Signed-off-by: Michael Roth <mdr...@linux.vnet.ibm.com>
---
virtproxy.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
virtproxy.h | 1 +
2 files changed, 78 insertions(+), 0 deletions(-)
diff --git a/virtproxy.c b/virtproxy.c
index f1f6859..78cda04 100644
--- a/virtproxy.c
+++ b/virtproxy.c
@@ -895,3 +895,80 @@ int vp_set_iforward(VPDriver *drv, const char *service_id,
const char *addr,
return 0;
}
+
+/* utility function to parse iforward/oforward options for qemu-vp
+ * or virtproxy chardev and put them into QemuOpts
+ */
+int vp_parse(QemuOpts *opts, const char *str, bool is_channel)
+{
+ /* TODO: use VP_SERVICE_ID_LEN, bring it into virtproxy.h */
+ char service_id[32];
+ char channel_method[32];
+ char index[10];
+ char *addr;
+ char port[33];
+ int pos, ret;
+
+ if (is_channel == false) {
+ /* parse service id */
+ ret = sscanf(str,"%32[^:]:%n",service_id,&pos);
+ if (ret != 1) {
+ LOG("error parsing service id");
+ return -1;
+ }
+ qemu_opt_set(opts, "service_id", service_id);
+ } else {
+ /* parse connection type */
+ ret = sscanf(str,"%32[^:]:%n",channel_method,&pos);
+ if (ret != 1) {
+ LOG("error parsing channel method");
+ return -1;
+ }
+ qemu_opt_set(opts, "channel_method", channel_method);
+ }
+ str += pos;
+ pos = 0;
+
+ /* parse path/addr and port */
+ if (str[0] == '[') {
+ /* ipv6 formatted */
+ ret = sscanf(str,"[%a[^]:]]:%32[^:]%n",&addr,port,&pos);
+ qemu_opt_set(opts, "ipv6", "on");
+ } else {
+ ret = sscanf(str,"%a[^:]:%32[^:]%n",&addr,port,&pos);
+ qemu_opt_set(opts, "ipv4", "on");
+ }
+
+ if (ret != 2) {
+ LOG("error parsing path/addr/port");
+ return -1;
+ } else if (port[0] == '-') {
+ /* no port given, assume unix path */
+ qemu_opt_set(opts, "path", addr);
+ } else {
+ qemu_opt_set(opts, "host", addr);
+ qemu_opt_set(opts, "port", port);
+ qemu_free(addr);
+ }
+ str += pos;
+ pos = 0;
+
+ if (str[0] == ':') {
+ /* parse optional index parameter */
+ ret = sscanf(str,":%10[^:]%n",index,&pos);
+ } else {
+ qemu_opt_set(opts, "index", "0");
+ return 0;
+ }
+
+ if (ret != 1) {
+ LOG("error parsing index");
+ return -1;
+ } else {
+ qemu_opt_set(opts, "index", index);
+ }
+ str += pos;
+ pos = 0;
+
+ return 0;
+}
diff --git a/virtproxy.h b/virtproxy.h
index ef168b0..6a53487 100644
--- a/virtproxy.h
+++ b/virtproxy.h
@@ -44,5 +44,6 @@ int vp_handle_packet_buf(VPDriver *drv, const void *buf, int
count);
int vp_set_oforward(VPDriver *drv, int fd, const char *service_id);
int vp_set_iforward(VPDriver *drv, const char *service_id, const char *addr,
const char *port, bool ipv6);
+int vp_parse(QemuOpts *opts, const char *str, bool is_channel);
#endif /* VIRTPROXY_H */
--
1.7.0.4
