Changeset 920

Timestamp:

Feb 1, 2007 12:33:12 AM (17 years ago)

Author:

bennylp

Message:

Implement ticket #83: socket TOS abstraction

Location:

pjproject/trunk

Files:

• aconfigure.ac (modified) (1 diff)
• pjlib/include/pj/compat/os_auto.h.in (modified) (1 diff)
• pjlib/include/pj/compat/socket.h (modified) (1 diff)
• pjlib/include/pj/sock.h (modified) (1 diff)
• pjlib/src/pj/sock_bsd.c (modified) (2 diffs)

pjproject/trunk/aconfigure.ac

@@ -128 +128 @@
 AC_CHECK_HEADER(netdb.h,[AC_DEFINE(PJ_HAS_NETDB_H,1)])
 AC_CHECK_HEADER(netinet/in.h,[AC_DEFINE(PJ_HAS_NETINET_IN_H,1)])
+AC_CHECK_HEADER(netinet/ip.h,[AC_DEFINE(PJ_HAS_NETINET_IP_H,1)])
 AC_CHECK_HEADER(setjmp.h,[AC_DEFINE(PJ_HAS_SETJMP_H,1)])
 AC_CHECK_HEADER(stdarg.h,[AC_DEFINE(PJ_HAS_STDARG_H,1)])

pjproject/trunk/pjlib/include/pj/compat/os_auto.h.in

@@ -51 +51 @@
 #undef PJ_HAS_NETDB_H
 #undef PJ_HAS_NETINET_IN_H
+#undef PJ_HAS_NETINET_IP_H
 #undef PJ_HAS_SETJMP_H
 #undef PJ_HAS_STDARG_H

pjproject/trunk/pjlib/include/pj/compat/socket.h

@@ -51 +51 @@
 #if defined(PJ_HAS_NETINET_IN_H) && PJ_HAS_NETINET_IN_H != 0
 #  include <netinet/in.h>
+#endif
+
+#if defined(PJ_HAS_NETINET_IP_H) && PJ_HAS_NETINET_IP_H != 0
+/* To pull in IPTOS_* constants */
+#  include <netinet/ip.h>
 #endif
 

pjproject/trunk/pjlib/include/pj/sock.h

@@ -93 +93 @@
 extern const pj_uint16_t PJ_SOL_UDP;    /**< UDP level.     */
 extern const pj_uint16_t PJ_SOL_IPV6;   /**< IP version 6   */
+
+
+/* IP_TOS 
+ *
+ * Note:
+ *  TOS CURRENTLY DOES NOT WORK IN Windows 2000 and above!
+ *  See http://support.microsoft.com/kb/248611
+ */
+extern const pj_uint16_t PJ_IP_TOS;     /**< IP_TOS optname in setsockopt() */
+
+
+/*
+ * IP TOS related constats.
+ *
+ * Note:
+ *  TOS CURRENTLY DOES NOT WORK IN Windows 2000 and above!
+ *  See http://support.microsoft.com/kb/248611
+ */
+extern const pj_uint16_t PJ_IPTOS_LOWDELAY;     /**< Minimize  delays       */
+extern const pj_uint16_t PJ_IPTOS_THROUGHPUT;   /**< Optimize throughput    */
+extern const pj_uint16_t PJ_IPTOS_RELIABILITY;  /**< Optimize for reliability*/
+extern const pj_uint16_t PJ_IPTOS_MINCOST;      /**< "filler data" where slow 
+                                                 transmission does't matter */
+
 
 /**

pjproject/trunk/pjlib/src/pj/sock_bsd.c

@@ -47 +47 @@
  * The values here are indexed based on pj_sock_type
  */
-const pj_uint16_t PJ_SOCK_STREAM        = SOCK_STREAM;
+const pj_uint16_t PJ_SOCK_STREAM= SOCK_STREAM;
 const pj_uint16_t PJ_SOCK_DGRAM = SOCK_DGRAM;
 const pj_uint16_t PJ_SOCK_RAW   = SOCK_RAW;
@@ -77 +77 @@
 #endif
 
+/* IP_TOS */
+#ifdef IP_TOS
+const pj_uint16_t PJ_IP_TOS     = IP_TOS;
+#else
+const pj_uint16_t PJ_IP_TOS     = 1;
+#endif
+
+
+/* TOS settings (declared in netinet/ip.h) */
+#ifdef IPTOS_LOWDELAY
+const pj_uint16_t PJ_IPTOS_LOWDELAY     = IPTOS_LOWDELAY;
+#else
+const pj_uint16_t PJ_IPTOS_LOWDELAY     = 0x10;
+#endif
+#ifdef IPTOS_THROUGHPUT
+const pj_uint16_t PJ_IPTOS_THROUGHPUT   = IPTOS_THROUGHPUT;
+#else
+const pj_uint16_t PJ_IPTOS_THROUGHPUT   = 0x08;
+#endif
+#ifdef IPTOS_RELIABILITY
+const pj_uint16_t PJ_IPTOS_RELIABILITY  = IPTOS_RELIABILITY;
+#else
+const pj_uint16_t PJ_IPTOS_RELIABILITY  = 0x04;
+#endif
+#ifdef IPTOS_MINCOST
+const pj_uint16_t PJ_IPTOS_MINCOST      = IPTOS_MINCOST;
+#else
+const pj_uint16_t PJ_IPTOS_MINCOST      = 0x02;
+#endif
+
+
 /* optname values. */
 const pj_uint16_t PJ_SO_TYPE    = SO_TYPE;