gutting this to put it in chiark-tcl

[chiark-tcl.git] / dgram / sockaddr.c

diff --git a/dgram/sockaddr.c b/dgram/sockaddr.c
index bedc10977bb25e82090846a8b2a6b255336c9c0c..c5592ea986abbfa52f1ddafe8e89ac0a9541ade4 100644 (file)
--- a/dgram/sockaddr.c
+++ b/dgram/sockaddr.c
@@ -62,10 +62,10 @@ void sockaddr_free(const SockAddr_Value *v) {
 /* Sockaddr Tcl type */
 
 static void sockaddr_t_dup(Tcl_Obj *src, Tcl_Obj *dup) {
-  objfreeir(dup);
   sockaddr_create(OBJ_SOCKADDR(dup),
                  sockaddr_addr(OBJ_SOCKADDR(src)),
                  sockaddr_len(OBJ_SOCKADDR(src)));
+  dup->typePtr= &hbytes_type;
 }
 
 static void sockaddr_t_free(Tcl_Obj *o) {
@@ -74,8 +74,9 @@ static void sockaddr_t_free(Tcl_Obj *o) {
 
 static void sockaddr_t_ustr(Tcl_Obj *o) {
   const struct sockaddr *sa;
-  char i46buf[INET6_ADDRSTRLEN];
-  int al, sl, pl;
+  char i46buf[INET6_ADDRSTRLEN], portbuf[50];
+  const struct sockaddr_in *sin;
+  int al;
   const char *string, *prepend;
   
   sa= sockaddr_addr(OBJ_SOCKADDR(o));
@@ -86,28 +87,29 @@ static void sockaddr_t_ustr(Tcl_Obj *o) {
   case AF_INET6:
     assert(sizeof(i46buf) >= INET_ADDRSTRLEN);
     assert(al >= sizeof(struct sockaddr_in));
-    inet_ntop(sa->sa_family, sa, i46buf, al);
-    string= i46buf;
-    prepend= "";
+    sin= (const void*)sa;
+    inet_ntop(sa->sa_family, &sin->sin_addr, i46buf, al);
+    snprintf(portbuf,sizeof(portbuf),",%d",(int)ntohs(sin->sin_port));
+    prepend= i46buf;
+    string= portbuf;
     break;
 
   case AF_UNIX:
-    assert(al >= sizeof(struct sockaddr_un));
     string= ((const struct sockaddr_un*)sa)->sun_path;
     prepend= "";
     if (!string[0]) string="//"; 
-    else if (string[0] != '/' || string[1] == '/') prepend= "./"; 
+    else if (string[0] != '/' || string[1] == '/') prepend= "./";
+    break;
 
   default: /* ouch ! */
     obj_updatestr_array_prefix(o,(const void*)sa,al,"?");
     return;
   }
 
-  pl= strlen(prepend);
-  sl= strlen(string);
-  o->bytes= TALLOC(sl+1);
-  memcpy(o->bytes, prepend, pl);
-  memcpy(o->bytes+pl, string, sl+1);
+  obj_updatestr_vstringls(o,
+                         prepend, strlen(prepend),
+                         string, strlen(string),
+                         (char*)0);
 }
 
 static int sockaddr_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) {
@@ -130,14 +132,14 @@ static int sockaddr_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) {
     sl= sizeof(s.sun);
     s.sun.sun_family= AF_UNIX;
 
-    if (strcmp(str,"//")) path= "";
-    else if (memcmp(str,"./",2) && str[2]) path= str+2;
+    if (!strcmp(str,"//")) path= "";
+    else if (!memcmp(str,"./",2) && str[2]) path= str+2;
     else { assert(str[0]=='/' && str[1]!='/'); path=str; }
 
     if (strlen(str) >= sizeof(s.sun.sun_path))
-      return staticerr(ip, "AF_UNIX path too long");
+      return staticerr(ip, "AF_UNIX path too long", "SOCKADDR AFUNIX LENGTH");
 
-    strcpy(s.sun.sun_path, str);
+    strcpy(s.sun.sun_path, path);
 
   } else if ((comma= strchr(str, ','))) {
 
@@ -157,21 +159,24 @@ static int sockaddr_t_sfa(Tcl_Interp *ip, Tcl_Obj *o) {
     }
     TFREE(copy);
 
-    if (!iprv) return staticerr(ip, "bad IPv4 address syntax");
+    if (!iprv)
+      return staticerr(ip, "bad IPv4 address syntax", "SOCKADDR SYNTAX IPV4");
 
     comma++;
     if (!strcmp(comma,"*")) {
       s.sin.sin_port= 0;
     } else {
       errno=0; port_l=strtoul(comma,&ep,10);
-      if (errno || *ep) return staticerr(ip, "bad IPv4 port");
-      if (port_l > 65535) return staticerr(ip, "IPv4 port out of range");
+      if (errno || *ep)
+       return staticerr(ip, "bad IPv4 port", "SOCKADDR SYNTAX IPV4");
+      if (port_l > 65535)
+       return staticerr(ip, "IPv4 port out of range", "SOCKADDR SYNTAX IPV4");
       s.sin.sin_port= htons(port_l);
     }
 
   } else {
 
-    return staticerr(ip, "bad socket address syntax");
+    return staticerr(ip, "bad socket address syntax", "SOCKADDR SYNTAX OTHER");
 
   }