Changeset 13:ef9ef3bf4752 in freeDiameter for freeDiameter/fdd.y

Timestamp:

Sep 30, 2009, 6:25:46 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Progress on peer state machine

File:

• freeDiameter/fdd.y (modified) (2 diffs)

freeDiameter/fdd.y

@@ -210 +210 @@
                                 memset(ep, 0, sizeof(struct fd_endpoint));
                                 fd_list_init(&ep->chain, NULL);
+                                ep->meta.conf = 1;
                                 
                                 memset(&hints, 0, sizeof(hints));
                                 hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
                                 ret = getaddrinfo($3, NULL, &hints, &ai);
-                                if (ret) { yyerror (&yylloc, conf, gai_strerror(ret)); YYERROR; }
-                                
+                                if (ret) { yyerror (&yylloc, conf, gai_strerror(ret)); free(ep); YYERROR; }
+                                ASSERT( ai->ai_addrlen <= sizeof(sSS) );
                                 memcpy(&ep->ss, ai->ai_addr, ai->ai_addrlen);
                                 free($3);
@@ -426 +427 @@
                                 memset(ep, 0, sizeof(struct fd_endpoint));
                                 fd_list_init(&ep->chain, NULL);
-                                
+                                ep->meta.conf = 1;
                                 memset(&hints, 0, sizeof(hints));
-                                hints.ai_flags = AI_ADDRCONFIG;
+                                hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICHOST;
                                 ret = getaddrinfo($4, NULL, &hints, &ai);
-                                if (ret) { yyerror (&yylloc, conf, gai_strerror(ret)); YYERROR; }
+                                if (ret == EAI_NONAME) {
+                                        /* The name was maybe not numeric, try again */
+                                        ep->meta.disc = 1;
+                                        hints.ai_flags &= ~ AI_NUMERICHOST;
+                                        ret = getaddrinfo($4, NULL, &hints, &ai);
+                                }
+                                if (ret) { yyerror (&yylloc, conf, gai_strerror(ret)); free(ep); YYERROR; }
                                 
                                 memcpy(&ep->ss, ai->ai_addr, ai->ai_addrlen);