[Ovirt-devel] [PATCH viewer] few minor bugfixes

Daniel P. Berrange berrange at redhat.com
Mon Jun 1 19:39:31 UTC 2009


On Mon, Jun 01, 2009 at 11:35:40AM -0400, Mohammed Morsi wrote:
> +
> +test -f Makefile && make -k distclean || :
> +
> +./autogen.sh
> +./configure --prefix=$AUTOBUILD_INSTALL_ROOT

Normally autogen.sh will run configure for you ? If the
ovirt-viewer script does, then you can just pass the
--prefix arg straight to autogen.sh and script configure


> -#if defined(HAVE_SOCKET) && defined(HAVE_CONNECT) && defined(HAVE_HTONS) && defined(HAVE_GETHOSTBYNAME)
> +#if defined(HAVE_SOCKET) && defined(HAVE_CONNECT) && defined(HAVE_HTONS)
>  
>  static int 
>  viewer_open_vnc_socket(const char* vnchost, int vncport)
>  {
>    int socketfd;
> -  struct hostent *serv;
>    struct sockaddr_in serv_addr;
>  
>    socketfd = socket(PF_INET, SOCK_STREAM, 0);
> @@ -917,14 +918,9 @@ viewer_open_vnc_socket(const char* vnchost, int vncport)
>        return -1;
>    }
>  
> -  serv = gethostbyname(vnchost);
> -  if(serv == NULL){
> -      return -1;
> -  }
> -
>    serv_addr.sin_family = PF_INET;
>    serv_addr.sin_port = htons(vncport);
> -  serv_addr.sin_addr.s_addr = ((struct in_addr *)(serv->h_addr))->s_addr; 
> +  serv_addr.sin_addr.s_addr = inet_addr(vnchost);
>  
>    if (connect(socketfd,(struct sockaddr *)&serv_addr,sizeof(serv_addr)) < 0){
>        return -1;
> @@ -933,7 +929,7 @@ viewer_open_vnc_socket(const char* vnchost, int vncport)
>    return socketfd;
>  }


This method should really be re-written to just use getaddrinfo() for
lookups.


Daniel
-- 
|: Red Hat, Engineering, London   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|




More information about the ovirt-devel mailing list