Diff for /libaitsess/inc/defs.h between versions 1.1 and 1.5

version 1.1, 2008/08/28 13:18:30 version 1.5, 2012/02/28 13:00:24
Line 1 Line 1
   /*************************************************************************
   * (C) 2008 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
   *  by Michael Pounov <misho@openbsd-bg.org>
   *
   * $Author$
   * $Id$
   *
   **************************************************************************
   The ELWIX and AITNET software is distributed under the following
   terms:
   
   All of the documentation and software included in the ELWIX and AITNET
   Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
   
   Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
           by Michael Pounov <misho@elwix.org>.  All rights reserved.
   
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
   are met:
   1. Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
   2. Redistributions in binary form must reproduce the above copyright
      notice, this list of conditions and the following disclaimer in the
      documentation and/or other materials provided with the distribution.
   3. All advertising materials mentioning features or use of this software
      must display the following acknowledgement:
   This product includes software developed by Michael Pounov <misho@elwix.org>
   ELWIX - Embedded LightWeight unIX and its contributors.
   4. Neither the name of AITNET nor the names of its contributors
      may be used to endorse or promote products derived from this software
      without specific prior written permission.
   
   THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
   ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   SUCH DAMAGE.
   */
 #ifndef __DEFS_H  #ifndef __DEFS_H
 #define __DEFS_H  #define __DEFS_H
   
#define MAX_STR                255#define STRSIZ                256
   
   #define SESS_AIT_MAGIC  0x3CC3
   
   #define MEM_MODE        0640
   #define MEM_DELIM       "\xFF"
   
   #define MEM_MAGIC_START 0xAAAAAAAA
   #define MEM_MAGIC_STOP  0x55555555
   #define MEM_ALLOC_MAX   0xFFFFFFF3
   
   /* memory pool helper macros */
   
   #define MEM_MIN_BUCKET  4
   #define MEM_MAX_BUCKET  32
   
   #define MEM_PTR2LINT(x) ((u_int) ((uintptr_t)(x)) & 0xFFFFFFFF)
   #define MEM_PTR2HINT(x) ((u_int) (sizeof(uintptr_t) == sizeof(u_int)) ? 0 : \
                                   (((uintptr_t)(x)) >> 32) & 0xFFFFFFFF)
   #define MEM_INT2PTR(x)  ((void*) ((uintptr_t)(x)))
   
   #define MEM_BADADDR(x)  (MEM_PTR2LINT(x) < 0x00001000U || MEM_PTR2LINT(x) > 0xFFFFF000U)
   #define MEM_CORRUPT(x)  (!(x) || ((u_int*)(x))[-1] != MEM_MAGIC_START || \
                                   ((u_int*)(x))[((u_int*)(x))[-2]] != MEM_MAGIC_STOP)
   
   #define mem_data(x, _type)      (assert((x)), (_type) ((x)->alloc_mem ? ((x)->alloc_mem + 2) : NULL))
   #define mem_len(x)              (assert((x)), (x)->alloc_mem ? *(x)->alloc_mem : 0)
   #define mem_size(x)             (mem_len((x)) * sizeof(u_int))
   
   
 #define LOGERR  { \  #define LOGERR  { \
                        sessErrno = errno; \                        sess_Errno = errno; \
                        bzero(sessError, MAX_STR + 1); \                        strlcpy(sess_Error, strerror(errno), sizeof sess_Error); \
                        strncpy(sessError, strerror(errno), MAX_STR); \ 
                 }                  }
   
 /*  /*
Line 15  union semun { Line 87  union semun {
         struct semid_ds         *buf;          struct semid_ds         *buf;
         unsigned short int      *array;          unsigned short int      *array;
         struct seminfo          *__buf;          struct seminfo          *__buf;
   }; */
   #ifndef HAVE_UNION_SEMUN
   union semun {
           int             val;            /* value for SETVAL */
           struct semid_ds *buf;           /* buffer for IPC_STAT & IPC_SET */
           unsigned short  *array;         /* array for GETALL & SETALL */
 };  };
*/#endif
   
   typedef struct _tagSessHdr {
           uint16_t        hdr_magic;
           uint16_t        hdr_argc;
   } sess_hdr_t;
   
extern int sessErrno;
extern char sessError[];extern int sess_Errno;
 extern char sess_Error[STRSIZ];
   
   
 #endif  #endif

Removed from v.1.1  
changed lines
  Added in v.1.5


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