Changeset 58e9dec in mainline for uspace/srv

Timestamp:

2015-05-22T07:31:57Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2989c7e

Parents:

2f19103

Message:

Definitions for RFC 6335 port number ranges.

Location:

uspace/srv/net

Files:

• tcp/conn.c (modified) (1 diff)
• tcp/tcp_type.h (modified) (1 diff)
• tcp/ucall.c (modified) (1 diff)
• udp/assoc.c (modified) (4 diffs)
• udp/udp_type.h (modified) (1 diff)

uspace/srv/net/tcp/conn.c

@@ -344 +344 @@
                 return false;
 
-        if ((patt->port != TCP_PORT_ANY) &&
+        if ((patt->port != inet_port_any) &&
             (patt->port != ep->port))
                 return false;

uspace/srv/net/tcp/tcp_type.h

@@ -113 +113 @@
 } tcp_control_t;
 
-enum tcp_port {
-        TCP_PORT_ANY = 0
-};
-
 /** Connection incoming segments queue */
 typedef struct {

uspace/srv/net/tcp/ucall.c

@@ -342 +342 @@
                 conn->ident.remote.addr = epp->remote.addr;
 
-        if (conn->ident.remote.port == TCP_PORT_ANY)
+        if (conn->ident.remote.port == inet_port_any)
                 conn->ident.remote.port = epp->remote.port;
 

uspace/srv/net/udp/assoc.c

@@ -39 +39 @@
 #include <stdbool.h>
 #include <fibril_synch.h>
+#include <inet/endpoint.h>
 #include <io/log.h>
 #include <stdlib.h>
@@ -270 +271 @@
 
         if ((inet_addr_is_any(&epp.remote.addr)) ||
-            (epp.remote.port == UDP_PORT_ANY))
+            (epp.remote.port == inet_port_any))
                 return EINVAL;
 
@@ -422 +423 @@
         log_msg(LOG_DEFAULT, LVL_NOTE, "addr OK");
 
-        if ((patt->port != UDP_PORT_ANY) &&
+        if ((patt->port != inet_port_any) &&
             (patt->port != ep->port))
                 return false;
@@ -476 +477 @@
                     aepp, la, ra);
                 /* Skip unbound associations */
-                if (aepp->local.port == UDP_PORT_ANY) {
+                if (aepp->local.port == inet_port_any) {
                         log_msg(LOG_DEFAULT, LVL_NOTE, "skip unbound");
                         continue;

uspace/srv/net/udp/udp_type.h

@@ -61 +61 @@
         XF_DUMMY = 0x1
 } xflags_t;
-
-enum udp_port {
-        UDP_PORT_ANY = 0
-};
 
 /** Unencoded UDP message (datagram) */