Clean up the int -> str and ip -> str conversion code, and add double -> str.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2546 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_vrt.c b/varnish-cache/bin/varnishd/cache_vrt.c
index 64c1a1a0ce79a25ab0ea41d66bf293e9e53121bd..b9e90fadfff7e3fe133346d3fb83d4ee7c13eba9 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_vrt.c
+++ b/varnish-cache/bin/varnishd/cache_vrt.c
@@ -37,6 +37,7 @@
 #include <sys/socket.h>
 
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -556,42 +557,53 @@ VRT_r_backend_health(const struct sess *sp)
 char *
 VRT_IP_string(const struct sess *sp, const struct sockaddr *sa)
 {
-       char h[64], p[8], *q;
-       socklen_t len = 0;
+       char *p;
+       const void *addr;
+       int len;
 
-       /* XXX can't rely on sockaddr.sa_len */
        switch (sa->sa_family) {
        case AF_INET:
-               len = sizeof(struct sockaddr_in);
+               len = INET_ADDRSTRLEN;
+               addr = &((const struct sockaddr_in *)sa)->sin_addr;
                break;
        case AF_INET6:
-               len = sizeof(struct sockaddr_in6);
+               len = INET_ADDRSTRLEN;
+               addr = &((const struct sockaddr_in6 *)sa)->sin6_addr;
                break;
        default:
                INCOMPL();
        }
        XXXAN(len);
-       TCP_name(sa, len, h, sizeof h, p, sizeof p);
-       q = WS_Alloc(sp->http->ws, strlen(h) + strlen(p) + 2);
-       AN(q);
-       strcpy(q, h);
-       strcat(q, ":");
-       strcat(q, p);
-       return (q);
+       AN(p = WS_Alloc(sp->http->ws, len));
+       AN(inet_ntop(sa->sa_family, addr, p, len));
+       return (p);
 }
 
 char *
 VRT_int_string(const struct sess *sp, int num)
 {
        char *p;
-       int size = 12;
-       
-       p = WS_Alloc(sp->http->ws, size);
-       AN(p);
+       int size;
+
+       size = snprintf(NULL, 0, "%d", num) + 1;
+       AN(p = WS_Alloc(sp->http->ws, size));
        assert(snprintf(p, size, "%d", num) < size);
        return (p);
 }
 
+char *
+VRT_double_string(const struct sess *sp, double num)
+{
+       char *p;
+       int size;
+
+       size = snprintf(NULL, 0, "%.3f", num) + 1;
+       AN(p = WS_Alloc(sp->http->ws, size));
+       assert((p = malloc(size)) != 0);
+       assert(snprintf(p, size, "%.3f", num) < size);
+       return (p);
+}
+
 /*--------------------------------------------------------------------*/
 
 void

diff --git a/varnish-cache/include/vrt.h b/varnish-cache/include/vrt.h
index ea7a0f2b43687c777cfa4e0005edf667aed7f25e..7048f8dc7a7d039b9eba44be5e44a2d27a619a56 100644 (file)
--- a/varnish-cache/include/vrt.h
+++ b/varnish-cache/include/vrt.h
@@ -135,6 +135,7 @@ void VRT_fini_dir(struct cli *, struct director *);
 
 char *VRT_IP_string(const struct sess *sp, const struct sockaddr *sa);
 char *VRT_int_string(const struct sess *sp, int);
+char *VRT_double_string(const struct sess *sp, double);
 
 #define VRT_done(sp, hand)                     \
        do {                                    \