[BACK]Return to ox_getport.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / ox_socket

Diff for /OpenXM/src/ox_socket/ox_getport.c between version 1.3 and 1.8

version 1.3, 2000/12/01 08:15:06 version 1.8, 2000/12/01 17:42:26
Line 23 
Line 23 
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.   * SUCH DAMAGE.
  *   *
  *      $OpenXM: OpenXM/src/ox_socket/ox_getport.c,v 1.2 2000/12/01 08:09:41 maekawa Exp $   *      $OpenXM: OpenXM/src/ox_socket/ox_getport.c,v 1.7 2000/12/01 17:37:53 maekawa Exp $
  */   */
   
 #include <sys/types.h>  #include <sys/types.h>
Line 38 
Line 38 
   
 #include "ox_socket.h"  #include "ox_socket.h"
   
 #ifndef INET6  #ifndef HAVE_SOCKADDR_STORAGE
 /* Derived from RFC2553 */  /* Derived from RFC2553 */
 #define _SS_MAXSIZE     128  #define _SS_MAXSIZE     128
 #define _SS_ALIGNSIZE   (sizeof(int64_t))  #define _SS_ALIGNSIZE   (sizeof(int64_t))
   
 #ifdef HAVE_SOCKADDR_LEN  #ifdef HAVE_SOCKADDR_LEN
 #define _SS_PAD1SIZE    (_SS_ALIGNSIZE - sizeof(uint8_t) - sizeof(sa_family_t))  #define _SS_PAD1SIZE    (_SS_ALIGNSIZE - sizeof(uint8_t) - sizeof(sa_family_t))
   #define _SS_PAD2SIZE    (_SS_ALIGNSIZE - sizeof(uint8_t) - sizeof(sa_family_t) \
                            - _SS_PAD1SIZE - _SS_ALIGNSIZE)
 #else /* HAVE_SOCKADDR_LEN */  #else /* HAVE_SOCKADDR_LEN */
 #define _SS_PAD1SIZE    (_SS_ALIGNSIZE - sizeof(sa_family_t))  #define _SS_PAD1SIZE    (_SS_ALIGNSIZE - sizeof(sa_family_t))
   #define _SS_PAD2SIZE    (_SS_MAXSIZE - sizeof(sa_family_t) \
                            - _SS_PAD1SIZE - _SS_ALIGNSIZE)
 #endif /* HAVE_SOCKADDR_LEN */  #endif /* HAVE_SOCKADDR_LEN */
 #define _SS_PAD2SIZE    (_SS_MAXSIZE - sizeof(sa_family_t)  
                          + _SS_PAD1SIZE + _SS_ALIGNSIZE)  
   
 struct sockaddr_storage {  struct sockaddr_storage {
 #ifdef HAVE_SOCKADDR_LEN  #ifdef HAVE_SOCKADDR_LEN
         uint8_t         __ss_len;          uint8_t         ss_len;
 #endif /* HAVE_SOCKADDR_LEN  #endif /* HAVE_SOCKADDR_LEN */
         sa_family_t     __ss_family;          sa_family_t     ss_family;
   
         char            __ss_pad1[_SS_PAD1SIZE];          char            __ss_pad1[_SS_PAD1SIZE];
         int64_t         __ss_align;          int64_t         __ss_align;
         char            __ss_pad2[_SS_PAD2SIZE];          char            __ss_pad2[_SS_PAD2SIZE];
 };  };
 #endif /* INET6 */  #endif /* HAVE_SOCKADDR_STORAGE */
   
 int  int
 ox_getport(int sock)  ox_getport(int sock)
Line 74  ox_getport(int sock)
Line 76  ox_getport(int sock)
                 return (-1);                  return (-1);
         }          }
   
         switch (ss.__ss_family) {          switch (ss.ss_family) {
         case AF_INET:          case AF_INET:
         {          {
                 struct sockaddr_in *sin;                  struct sockaddr_in *sin;
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.8
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>