From: Amos Kong <akong@redhat.com> To: aliguori@us.ibm.com, kvm@vger.kernel.org, quintela@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org, owasserm@redhat.com, laine@redhat.com Subject: [PATCH v3 7/9] net: introduce parse_host_port_info() Date: Wed, 07 Mar 2012 06:48:39 +0800 [thread overview] Message-ID: <20120306224839.24264.35771.stgit@dhcp-8-167.nay.redhat.com> (raw) In-Reply-To: <20120306224330.24264.9494.stgit@dhcp-8-167.nay.redhat.com> int parse_host_port(struct sockaddr_in *saddr, const char *str) Parsed address info will be restored into 'saddr', it only support ipv4. This function is used by net_socket_mcast_init() and net_socket_udp_init(). int parse_host_port_info(struct addrinfo *result, const char *str) Parsed address info will be restored into 'result', it's an address list. It can be used to parse IPv6 address/port. Signed-off-by: Amos Kong <akong@redhat.com> --- net.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/net.c b/net.c index de1db8c..2518e5f 100644 --- a/net.c +++ b/net.c @@ -130,18 +130,15 @@ static int tcp_client_connect(int fd, struct addrinfo *rp) return ret; } -static int tcp_start_common(const char *str, int *fd, bool server) +static int parse_host_port_info(struct addrinfo **result, const char *str, + bool server) { char hostname[512]; const char *service; const char *name; struct addrinfo hints; - struct addrinfo *result, *rp; int s; - int sfd; - int ret = -EINVAL; - *fd = -1; service = str; if (get_str_sep(hostname, sizeof(hostname), &service, ':') < 0) { @@ -164,12 +161,29 @@ static int tcp_start_common(const char *str, int *fd, bool server) hints.ai_flags = AI_PASSIVE; } - s = getaddrinfo(name, service, &hints, &result); + s = getaddrinfo(name, service, &hints, result); if (s != 0) { error_report("qemu: getaddrinfo: %s", gai_strerror(s)); return -EINVAL; } + return 0; +} + +static int tcp_start_common(const char *str, int *fd, bool server) +{ + struct addrinfo *rp; + int sfd; + int ret = -EINVAL; + struct addrinfo *result; + + *fd = -1; + + ret = parse_host_port_info(&result, str, server); + if (ret < 0) { + return -EINVAL; + } + /* getaddrinfo() returns a list of address structures. Try each address until we successfully bind/connect). If socket(2) (or bind/connect(2)) fails, we (close the socket
WARNING: multiple messages have this Message-ID (diff)
From: Amos Kong <akong@redhat.com> To: aliguori@us.ibm.com, kvm@vger.kernel.org, quintela@redhat.com, jasowang@redhat.com, qemu-devel@nongnu.org, owasserm@redhat.com, laine@redhat.com Subject: [Qemu-devel] [PATCH v3 7/9] net: introduce parse_host_port_info() Date: Wed, 07 Mar 2012 06:48:39 +0800 [thread overview] Message-ID: <20120306224839.24264.35771.stgit@dhcp-8-167.nay.redhat.com> (raw) In-Reply-To: <20120306224330.24264.9494.stgit@dhcp-8-167.nay.redhat.com> int parse_host_port(struct sockaddr_in *saddr, const char *str) Parsed address info will be restored into 'saddr', it only support ipv4. This function is used by net_socket_mcast_init() and net_socket_udp_init(). int parse_host_port_info(struct addrinfo *result, const char *str) Parsed address info will be restored into 'result', it's an address list. It can be used to parse IPv6 address/port. Signed-off-by: Amos Kong <akong@redhat.com> --- net.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/net.c b/net.c index de1db8c..2518e5f 100644 --- a/net.c +++ b/net.c @@ -130,18 +130,15 @@ static int tcp_client_connect(int fd, struct addrinfo *rp) return ret; } -static int tcp_start_common(const char *str, int *fd, bool server) +static int parse_host_port_info(struct addrinfo **result, const char *str, + bool server) { char hostname[512]; const char *service; const char *name; struct addrinfo hints; - struct addrinfo *result, *rp; int s; - int sfd; - int ret = -EINVAL; - *fd = -1; service = str; if (get_str_sep(hostname, sizeof(hostname), &service, ':') < 0) { @@ -164,12 +161,29 @@ static int tcp_start_common(const char *str, int *fd, bool server) hints.ai_flags = AI_PASSIVE; } - s = getaddrinfo(name, service, &hints, &result); + s = getaddrinfo(name, service, &hints, result); if (s != 0) { error_report("qemu: getaddrinfo: %s", gai_strerror(s)); return -EINVAL; } + return 0; +} + +static int tcp_start_common(const char *str, int *fd, bool server) +{ + struct addrinfo *rp; + int sfd; + int ret = -EINVAL; + struct addrinfo *result; + + *fd = -1; + + ret = parse_host_port_info(&result, str, server); + if (ret < 0) { + return -EINVAL; + } + /* getaddrinfo() returns a list of address structures. Try each address until we successfully bind/connect). If socket(2) (or bind/connect(2)) fails, we (close the socket
next prev parent reply other threads:[~2012-03-06 22:48 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-03-06 22:47 [PATCH v3 0/9] support to migrate with IPv6 address Amos Kong 2012-03-06 22:47 ` [Qemu-devel] " Amos Kong 2012-03-06 22:47 ` [PATCH v3 1/9] net: introduce tcp_server_start() Amos Kong 2012-03-06 22:47 ` [Qemu-devel] " Amos Kong 2012-03-13 16:39 ` Michael Roth 2012-03-14 8:33 ` Amos Kong 2012-03-14 14:58 ` Michael Roth 2012-03-16 10:47 ` Amos Kong 2012-03-16 10:47 ` [Qemu-devel] " Amos Kong 2012-03-14 7:14 ` Orit Wasserman 2012-03-14 7:27 ` Paolo Bonzini 2012-03-14 7:27 ` Paolo Bonzini 2012-03-14 7:51 ` Amos Kong 2012-03-14 7:51 ` Amos Kong 2012-03-14 8:28 ` Paolo Bonzini 2012-03-14 8:28 ` Paolo Bonzini 2012-03-14 10:03 ` Orit Wasserman 2012-03-14 10:03 ` Orit Wasserman 2012-03-14 11:39 ` Kevin Wolf 2012-03-14 11:39 ` Kevin Wolf 2012-03-06 22:47 ` [PATCH v3 2/9] net: use tcp_server_start() for tcp server creation Amos Kong 2012-03-06 22:47 ` [Qemu-devel] " Amos Kong 2012-03-06 22:48 ` [PATCH v3 3/9] net: introduce tcp_client_start() Amos Kong 2012-03-06 22:48 ` [Qemu-devel] " Amos Kong 2012-03-13 18:35 ` Michael Roth 2012-03-14 10:19 ` Amos Kong 2012-03-14 15:30 ` Michael Roth 2012-03-14 7:31 ` Orit Wasserman 2012-03-06 22:48 ` [PATCH v3 4/9] net: use tcp_client_start for tcp client creation Amos Kong 2012-03-06 22:48 ` [Qemu-devel] " Amos Kong 2012-03-06 22:48 ` [PATCH v3 5/9] net: refector tcp_*_start functions Amos Kong 2012-03-06 22:48 ` [Qemu-devel] " Amos Kong 2012-03-06 22:48 ` [PATCH v3 6/9] net: use getaddrinfo() in tcp_start_common Amos Kong 2012-03-06 22:48 ` [Qemu-devel] " Amos Kong 2012-03-06 22:48 ` Amos Kong [this message] 2012-03-06 22:48 ` [Qemu-devel] [PATCH v3 7/9] net: introduce parse_host_port_info() Amos Kong 2012-03-06 22:48 ` [PATCH v3 8/9] net: split hostname and service by last colon Amos Kong 2012-03-06 22:48 ` [Qemu-devel] " Amos Kong 2012-03-13 19:34 ` Michael Roth 2012-03-06 22:48 ` [PATCH v3 9/9] net: support to include ipv6 address by brackets Amos Kong 2012-03-06 22:48 ` [Qemu-devel] " Amos Kong 2012-03-13 19:47 ` Michael Roth 2012-03-14 9:58 ` Amos Kong 2012-03-14 9:58 ` [Qemu-devel] " Amos Kong 2012-03-14 15:38 ` Michael Roth
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20120306224839.24264.35771.stgit@dhcp-8-167.nay.redhat.com \ --to=akong@redhat.com \ --cc=aliguori@us.ibm.com \ --cc=jasowang@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=laine@redhat.com \ --cc=owasserm@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=quintela@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.