Changeset 719:dc71992e3378 in freeDiameter

Timestamp:

Feb 21, 2011, 6:29:14 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Be less tolerant on DiameterURI format

File:

• libfdproto/ostr.c (modified) (4 diffs)

libfdproto/ostr.c

@@ -316 +316 @@
                         
                         if (t >= (1<<16)) {
-                                TRACE_DEBUG(INFO, "Invalid DiameterURI: port value is too big, ignored.");
-                                p = 0;
-                                break;
+                                TRACE_DEBUG(INFO, "Invalid DiameterURI: port value is too big.");
+                                return EINVAL;
                         }
 
@@ -366 +365 @@
                 }
                 
-                TRACE_DEBUG(INFO, "Invalid DiameterURI: transport string is not recognized ('%.*s'), ignored.", urisz - offset, uri + offset);
-                
-                /* eat the remaining of invalid transport until a ';' */
-                for (; (offset < urisz) && ((char)uri[offset] != ';'); offset++);
+                TRACE_DEBUG(INFO, "Invalid DiameterURI: transport string is not recognized ('%.*s').", urisz - offset, uri + offset);
+                return EINVAL;
         }
 after_transport:
@@ -405 +402 @@
                 }
                 
-                TRACE_DEBUG(INFO, "Invalid DiameterURI: protocol string is not recognized ('%.*s'), ignored.", urisz - offset, uri + offset);
-                
-                /* eat the remaining of invalid transport until a ';' */
-                for (; (offset < urisz) && ((char)uri[offset] != ';'); offset++);
+                TRACE_DEBUG(INFO, "Invalid DiameterURI: protocol string is not recognized ('%.*s').", urisz - offset, uri + offset);
+                return EINVAL;
+                
         }
 after_proto:
@@ -414 +410 @@
                 return 0; /* Finished */
         
-        TRACE_DEBUG(INFO, "Invalid DiameterURI: string is not recognized ('%.*s'), ignored.", urisz - offset, uri + offset);
-        return 0;
+        TRACE_DEBUG(INFO, "Invalid DiameterURI: final part of string is not recognized ('%.*s').", urisz - offset, uri + offset);
+        return EINVAL;
 }