[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.6 and 1.7

version 1.6, 2000/12/01 17:34:14 version 1.7, 2000/12/01 17:37:53
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.5 2000/12/01 08:34:37 maekawa Exp $   *      $OpenXM: OpenXM/src/ox_socket/ox_getport.c,v 1.6 2000/12/01 17:34:14 maekawa Exp $
  */   */
   
 #include <sys/types.h>  #include <sys/types.h>
Line 45 
Line 45 
   
 #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))
 #endif /* HAVE_SOCKADDR_LEN */  
 #define _SS_PAD2SIZE    (_SS_MAXSIZE - sizeof(sa_family_t) \  #define _SS_PAD2SIZE    (_SS_MAXSIZE - sizeof(sa_family_t) \
                          - _SS_PAD1SIZE - _SS_ALIGNSIZE)                           - _SS_PAD1SIZE - _SS_ALIGNSIZE)
   #endif /* HAVE_SOCKADDR_LEN */
   
 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;
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.6  
changed lines
  Added in v.1.7

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>