Changes in freeDiameter/fdd.y [24:bd83ce9328ed:20:277ec00d793e] in freeDiameter

File:

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

freeDiameter/fdd.y

@@ -212 +212 @@
 listenon:               LISTENON '=' QSTRING ';'
                         {
+                                struct fd_endpoint * ep;
                                 struct addrinfo hints, *ai;
                                 int ret;
+                                
+                                CHECK_MALLOC_DO( ep = malloc(sizeof(struct fd_endpoint)),
+                                        { yyerror (&yylloc, conf, "Out of memory"); YYERROR; } );
+                                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; }
-                                CHECK_FCT_DO( fd_ep_add_merge( &conf->cnf_endpoints, ai->ai_addr, ai->ai_addrlen, EP_FL_CONF ), 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);
                                 freeaddrinfo(ai);
-                                free($3);
+                                fd_list_insert_before(&conf->cnf_endpoints, &ep->chain);
                         }
                         ;
@@ -327 +336 @@
                                 /* Now destroy any content in the structure */
                                 free(fddpi.pi_diamid);
-                                free(fddpi.pi_sec_data.priority);
                                 while (!FD_IS_LIST_EMPTY(&fddpi.pi_endpoints)) {
                                         struct fd_list * li = fddpi.pi_endpoints.next;
@@ -407 +415 @@
                                 fddpi.pi_port = (uint16_t)$4;
                         }
+                        | peerparams SCTPSTREAMS '=' INTEGER ';'
+                        {
+                                CHECK_PARAMS_DO( ($4 > 0) && ($4 < 1<<16),
+                                        { yyerror (&yylloc, conf, "Invalid value"); YYERROR; } );
+                                fddpi.pi_streams = (uint16_t)$4;
+                        }
                         | peerparams TCTIMER '=' INTEGER ';'
                         {
                                 fddpi.pi_tctimer = $4;
                         }
-                        | peerparams TLS_PRIO '=' QSTRING ';'
-                        {
-                                fddpi.pi_sec_data.priority = $4;
-                        }
                         | peerparams TWTIMER '=' INTEGER ';'
                         {
@@ -421 +431 @@
                         | peerparams CONNTO '=' QSTRING ';'
                         {
+                                struct fd_endpoint * ep;
                                 struct addrinfo hints, *ai;
                                 int ret;
-                                int disc = 0;
                                 
+                                CHECK_MALLOC_DO( ep = malloc(sizeof(struct fd_endpoint)),
+                                        { yyerror (&yylloc, conf, "Out of memory"); YYERROR; } );
+                                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 | AI_NUMERICHOST;
@@ -430 +445 @@
                                 if (ret == EAI_NONAME) {
                                         /* The name was maybe not numeric, try again */
-                                        disc = EP_FL_DISC;
+                                        ep->meta.disc = 1;
                                         hints.ai_flags &= ~ AI_NUMERICHOST;
                                         ret = getaddrinfo($4, NULL, &hints, &ai);
                                 }
-                                if (ret) { yyerror (&yylloc, conf, gai_strerror(ret)); YYERROR; }
+                                if (ret) { yyerror (&yylloc, conf, gai_strerror(ret)); free(ep); YYERROR; }
                                 
-                                CHECK_FCT_DO( fd_ep_add_merge( &fddpi.pi_endpoints, ai->ai_addr, ai->ai_addrlen, EP_FL_CONF | disc ), YYERROR );
+                                memcpy(&ep->ss, ai->ai_addr, ai->ai_addrlen);
                                 free($4);
                                 freeaddrinfo(ai);
+                                fd_list_insert_before(&fddpi.pi_endpoints, &ep->chain);
                         }
                         ;