Menu
▾
▴
freedce-cvs — CVS commit logs/messages
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(20) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
|
Feb
(7) |
Mar
|
Apr
(20) |
May
|
Jun
|
Jul
(52) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2005 |
Jan
(46) |
Feb
(38) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(146) |
Oct
(13) |
Nov
(2) |
Dec
|
| 2009 |
Jan
|
Feb
(28) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 21:31:00
|
Update of /cvsroot/freedce/freedce/include/dce/x86_64 In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29175 Added Files: marshall.h ndr_rep.h ndrtypes.h Log Message: add x86_64 marshalling define files --- NEW FILE --- /* * * (c) Copyright 1991 OPEN SOFTWARE FOUNDATION, INC. * (c) Copyright 1991 HEWLETT-PACKARD COMPANY * (c) Copyright 1991 DIGITAL EQUIPMENT CORPORATION * To anyone who acknowledges that this file is provided "AS IS" * without any express or implied warranty: * permission to use, copy, modify, and distribute this * file for any purpose is hereby granted without fee, provided that * the above copyright notices and this notice appears in all source * code copies, and that none of the names of Open Software * Foundation, Inc., Hewlett-Packard Company, or Digital Equipment * Corporation be used in advertising or publicity pertaining to * distribution of the software without specific, written prior * permission. Neither Open Software Foundation, Inc., Hewlett- * Packard Company, nor Digital Equipment Corporation makes any * representations about the suitability of this software for any * purpose. * */ /* */ /* * marshall.h * platform dependent (OS + Architecture) file split out from stubbase.h * for DCE 1.1 code cleanup * * This file is always included as part of stubbase.h */ #ifndef _MARSHALL_H #define _MARSHALL_H /* Intel x86 Architecture can use the default marshalling macros */ /* #define USE_DEFAULT_NDR_MARSHALLING_MACROS */ #endif /* _MARSHALL_H */ --- NEW FILE --- /* * * (c) Copyright 1991 OPEN SOFTWARE FOUNDATION, INC. * (c) Copyright 1991 HEWLETT-PACKARD COMPANY * (c) Copyright 1991 DIGITAL EQUIPMENT CORPORATION * To anyone who acknowledges that this file is provided "AS IS" * without any express or implied warranty: * permission to use, copy, modify, and distribute this * file for any purpose is hereby granted without fee, provided that * the above copyright notices and this notice appears in all source * code copies, and that none of the names of Open Software * Foundation, Inc., Hewlett-Packard Company, or Digital Equipment * Corporation be used in advertising or publicity pertaining to * distribution of the software without specific, written prior * permission. Neither Open Software Foundation, Inc., Hewlett- * Packard Company, nor Digital Equipment Corporation makes any * representations about the suitability of this software for any * purpose. * */ /* */ /* * ndr_rep.h * platform dependent (OS + Architecture) file split out from stubbase.h * for DCE 1.1 code cleanup. * This file contains the architecture specific definitions of the * local scaler data representation used * * This file is always included as part of stubbase.h */ #ifndef _NDR_REP_H #define _NDR_REP_H #define NDR_LOCAL_INT_REP ndr_c_int_little_endian #define NDR_LOCAL_FLOAT_REP ndr_c_float_ieee #define NDR_LOCAL_CHAR_REP ndr_c_char_ascii #endif /* _NDR_REP_H */ --- NEW FILE --- /* * * (c) Copyright 1991 OPEN SOFTWARE FOUNDATION, INC. * (c) Copyright 1991 HEWLETT-PACKARD COMPANY * (c) Copyright 1991 DIGITAL EQUIPMENT CORPORATION * To anyone who acknowledges that this file is provided "AS IS" * without any express or implied warranty: * permission to use, copy, modify, and distribute this * file for any purpose is hereby granted without fee, provided that * the above copyright notices and this notice appears in all source * code copies, and that none of the names of Open Software * Foundation, Inc., Hewlett-Packard Company, or Digital Equipment * Corporation be used in advertising or publicity pertaining to * distribution of the software without specific, written prior * permission. Neither Open Software Foundation, Inc., Hewlett- * Packard Company, nor Digital Equipment Corporation makes any * representations about the suitability of this software for any * purpose. * */ /* */ /* ** NAME: ** ** ndrtypes.h ** ** FACILITY: ** ** IDL Stub Support Include File ** ** ABSTRACT: ** ** This file is new for DCE 1.1. This is a platform specific file that ** defines the base level ndr types. This file is indirectly included ** in all files via the idlbase.h file. ** */ /* * This particular file defines the NDR types for a little-endian * architecture. This file also depends on the presence of a ANSI * C compiler, in that it uses the signed keyword to create the * ndr_small_int type. */ #ifndef _NDR_TYPES_H #define _NDR_TYPES_H typedef unsigned char ndr_boolean ; #define ndr_false false #define ndr_true true typedef unsigned char ndr_byte ; typedef unsigned char ndr_char ; typedef signed char ndr_small_int ; typedef unsigned char ndr_usmall_int ; typedef short int ndr_short_int ; typedef unsigned short int ndr_ushort_int ; /* long_int is 32-bit so make these int not long int for 64-bit */ typedef int ndr_long_int ; typedef unsigned int ndr_ulong_int ; /* * the reps for hyper must match the little-endian NDR rep since * defined(vax) || defined(M_I86) => defined(ALIGNED_SCALAR_ARRAYS) */ struct ndr_hyper_int_rep_s_t { ndr_ulong_int low; ndr_long_int high; }; typedef struct ndr_hyper_int_rep_s_t ndr_hyper_int ; struct ndr_uhyper_int_rep_s_t { ndr_ulong_int low; ndr_ulong_int high; }; typedef struct ndr_uhyper_int_rep_s_t ndr_uhyper_int ; typedef float ndr_short_float ; typedef double ndr_long_float ; #endif /* _NDR_TYPES_H */ |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 21:30:01
|
Update of /cvsroot/freedce/freedce/include/dce/x86_64 In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28891/x86_64 Log Message: Directory /cvsroot/freedce/freedce/include/dce/x86_64 added to the repository |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 19:14:20
|
Update of /cvsroot/freedce/dcethreads/src In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9439/src Modified Files: Makefile.am exc_handling.c pthd4_libc_wrapers.c pthread_dceexc.c Log Message: update to include syscall wrappers again Index: Makefile.am =================================================================== RCS file: /cvsroot/freedce/dcethreads/src/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Makefile.am 28 Sep 2005 22:31:10 -0000 1.4 --- Makefile.am 27 Feb 2009 19:14:06 -0000 1.5 *************** *** 15,19 **** if TARGET_OS_LINUX libdcethreads_la_SOURCES+=pthread_dce_atfork.c \ ! pthd4_libc_wrapers.c endif --- 15,19 ---- if TARGET_OS_LINUX libdcethreads_la_SOURCES+=pthread_dce_atfork.c \ ! pthd4_libc_wrapers.c endif *************** *** 21,23 **** noinst_HEADERS = pthread_dce_atfork.h ! EXTRA_DIST = Versions --- 21,23 ---- noinst_HEADERS = pthread_dce_atfork.h ! #EXTRA_DIST = Versions Index: exc_handling.c =================================================================== RCS file: /cvsroot/freedce/dcethreads/src/exc_handling.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** exc_handling.c 28 Sep 2005 22:31:10 -0000 1.3 --- exc_handling.c 27 Feb 2009 19:14:06 -0000 1.4 *************** *** 106,109 **** --- 106,114 ---- #define _DCE_PTHREADS_COMPAT_MACROS_ + #include <stdlib.h> + #include <stdio.h> + #include <string.h> + #include <signal.h> + #include "dce/dcethreads_conf.h" *************** *** 112,120 **** #include "dce/exc_handling.h" - #include <stdlib.h> - #include <stdio.h> - #include <string.h> - #include <signal.h> - /** ** --- 117,120 ---- *************** *** 762,765 **** --- 762,769 ---- } + #if 0 + extern void pthread_kill_other_threads(void); + #endif + /* * E X C _ L I B R A R Y _ F A T A L _ E R R O R *************** *** 809,815 **** */ #ifndef HAVE_OS_WIN32 ! pthread_kill_other_threads_np(); #endif /* raise(SIGABRT); */ exit(255); --- 813,822 ---- */ + #if 0 #ifndef HAVE_OS_WIN32 ! pthread_kill_other_threads(); ! #endif #endif + /* raise(SIGABRT); */ exit(255); Index: pthd4_libc_wrapers.c =================================================================== RCS file: /cvsroot/freedce/dcethreads/src/pthd4_libc_wrapers.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** pthd4_libc_wrapers.c 28 Sep 2005 22:31:10 -0000 1.3 --- pthd4_libc_wrapers.c 27 Feb 2009 19:14:07 -0000 1.4 *************** *** 360,364 **** *--------------------------------------------------------*/ CANCELABLE_SYSCALL (int, connect, ! (int fd, struct sockaddr *addr, socklen_t addrlen), (fd, addr, addrlen) ); --- 360,364 ---- *--------------------------------------------------------*/ CANCELABLE_SYSCALL (int, connect, ! (int fd, const struct sockaddr *addr, socklen_t addrlen), (fd, addr, addrlen) ); *************** *** 386,390 **** * use BSD prototype * *-----------------------------------------*/ ! #define net_type int #else /*-----------------------------------------* --- 386,390 ---- * use BSD prototype * *-----------------------------------------*/ ! #define net_type ssize_t #else /*-----------------------------------------* *************** *** 393,397 **** #define net_type ssize_t #endif ! /*--------------------------------------------------------* --- 393,397 ---- #define net_type ssize_t #endif ! /*--------------------------------------------------------* *************** *** 409,414 **** *--------------------------------------------------------*/ CANCELABLE_SYSCALL (net_type, recvfrom, ! (int fd, __ptr_t buf, size_t n, int flags, ! struct sockaddr addr, socklen_t *addr_len), (fd, buf, n, flags, addr, addr_len)) --- 409,414 ---- *--------------------------------------------------------*/ CANCELABLE_SYSCALL (net_type, recvfrom, ! (int fd, void*__restrict buf, size_t n, int flags, ! __SOCKADDR_ARG addr, socklen_t *__restrict addr_len), (fd, buf, n, flags, addr, addr_len)) Index: pthread_dceexc.c =================================================================== RCS file: /cvsroot/freedce/dcethreads/src/pthread_dceexc.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** pthread_dceexc.c 28 Sep 2005 22:31:10 -0000 1.4 --- pthread_dceexc.c 27 Feb 2009 19:14:07 -0000 1.5 *************** *** 290,294 **** */ ! case ( (int) PTHREAD_CANCELED ): RAISE(pthread_cancel_e); break; --- 290,294 ---- */ ! case ( (long) PTHREAD_CANCELED ): RAISE(pthread_cancel_e); break; |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 19:14:18
|
Update of /cvsroot/freedce/dcethreads/include/dce In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9439/include/dce Modified Files: exc_handling.h Log Message: update to include syscall wrappers again Index: exc_handling.h =================================================================== RCS file: /cvsroot/freedce/dcethreads/include/dce/exc_handling.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** exc_handling.h 29 Sep 2005 10:11:46 -0000 1.8 --- exc_handling.h 27 Feb 2009 19:14:06 -0000 1.9 *************** *** 575,578 **** --- 575,580 ---- */ + extern void _pthread_cleanup_push(void*, void*, void*); + static inline void _exc_push_buf(_exc_buf * buf) *************** *** 599,602 **** --- 601,606 ---- + extern void _pthread_cleanup_pop(void*, int); + static inline void _exc_pop_buf(_exc_buf * buf) |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 19:14:18
|
Update of /cvsroot/freedce/dcethreads In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9439 Modified Files: README configure.in Log Message: update to include syscall wrappers again Index: README =================================================================== RCS file: /cvsroot/freedce/dcethreads/README,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** README 20 Aug 2000 08:42:22 -0000 1.2 --- README 27 Feb 2009 19:14:01 -0000 1.3 *************** *** 6,10 **** Wez Furlong <we...@th...> ! This packages implements pthreads draft 4. For information about copyrights, see the file `COPYING' included with this --- 6,11 ---- Wez Furlong <we...@th...> ! This packages no longer implements pthreads draft 4. ! Instead, it purely implements dce threading exceptions. For information about copyrights, see the file `COPYING' included with this Index: configure.in =================================================================== RCS file: /cvsroot/freedce/dcethreads/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** configure.in 29 Sep 2005 10:00:08 -0000 1.9 --- configure.in 27 Feb 2009 19:14:03 -0000 1.10 *************** *** 81,135 **** AC_CHECK_FUNCS(gettimeofday) ! AC_DEFINE(YIELD_AFTER_PTHREAD_CREATE) - dnl check if glibc functions are true cancellation points - dnl - - if test "x$have_win32" == "x1"; then AC_DEFINE(USE_CANCELATION_WRAPPER, 1) - else - - AC_MSG_CHECKING([POSIX cancellation point]); - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <pthread.h> - #include <unistd.h> - #include <errno.h> - #include <time.h> - #include <stdlib.h> - #include <assert.h> - - int eintr=0; ! void* ! thread(void* unused) ! { ! struct timespec req={5,0}, rem; ! int status; ! ! do { ! status = nanosleep(&req, &rem); ! } ! while (status!=-1); ! ! eintr = (errno==EINTR); ! pthread_exit (NULL); ! } ! ! int ! main() ! { ! pthread_t thrid; ! assert (pthread_create(&thrid, NULL, thread, NULL)==0); ! sleep(1); ! assert (pthread_cancel (thrid)==0); ! sleep(1); ! exit (eintr); ! } ! ]])], ! [AC_MSG_RESULT([yes]) ], ! [AC_MSG_RESULT([no]) AC_DEFINE(USE_CANCELATION_WRAPPER, 1)] ! ) ! fi # have_win32 AC_OUTPUT(Makefile include/Makefile include/dce/Makefile src/Makefile tests/Makefile) --- 81,137 ---- AC_CHECK_FUNCS(gettimeofday) ! AC_DEFINE(YIELD_AFTER_PTHREAD_CREATE, 1) AC_DEFINE(USE_CANCELATION_WRAPPER, 1) ! dnl check if glibc functions are true cancellation points ! dnl ! dnl if test "x$have_win32" == "x1"; then ! dnl AC_DEFINE(USE_CANCELATION_WRAPPER, 1) ! dnl else ! dnl ! dnl AC_MSG_CHECKING([POSIX cancellation point]); ! dnl AC_RUN_IFELSE([AC_LANG_SOURCE([[ ! dnl #include <pthread.h> ! dnl #include <unistd.h> ! dnl #include <errno.h> ! dnl #include <time.h> ! dnl #include <stdlib.h> ! dnl #include <assert.h> ! dnl ! dnl int eintr=0; ! dnl ! dnl void* ! dnl thread(void* unused) ! dnl { ! dnl struct timespec req={5,0}, rem; ! dnl int status; ! dnl ! dnl do { ! dnl status = nanosleep(&req, &rem); ! dnl } ! dnl while (status!=-1); ! dnl ! dnl eintr = (errno==EINTR); ! dnl pthread_exit (NULL); ! dnl } ! dnl ! dnl int ! dnl main() ! dnl { ! dnl pthread_t thrid; ! dnl ! dnl assert (pthread_create(&thrid, NULL, thread, NULL)==0); ! dnl sleep(1); ! dnl assert (pthread_cancel (thrid)==0); ! dnl sleep(1); ! dnl exit (eintr); ! dnl } ! dnl ]])], ! dnl [AC_MSG_RESULT([yes]) ], ! dnl [AC_MSG_RESULT([no]) AC_DEFINE(USE_CANCELATION_WRAPPER, 1)] ! dnl ) ! dnl fi # have_win32 AC_OUTPUT(Makefile include/Makefile include/dce/Makefile src/Makefile tests/Makefile) |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 18:15:38
|
Update of /cvsroot/freedce/freedce/rpcd In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15728/rpcd Modified Files: dsm.h Log Message: 64-bit-isms Index: dsm.h =================================================================== RCS file: /cvsroot/freedce/freedce/rpcd/dsm.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** dsm.h 27 Feb 2009 16:45:18 -0000 1.2 --- dsm.h 27 Feb 2009 18:15:22 -0000 1.3 *************** *** 36,40 **** #define dsm_version (0x1) #define dsm_hdr_size (0x30) ! #define dsm_magic_marker (0xfffffffff000000f) extern void dsm_create( #ifdef IDL_PROTOTYPES --- 36,40 ---- #define dsm_version (0x1) #define dsm_hdr_size (0x30) ! #define dsm_magic_marker (0xf000000f) extern void dsm_create( #ifdef IDL_PROTOTYPES |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 18:15:05
|
Update of /cvsroot/freedce/freedce/perf In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15652 Modified Files: Makefile.am client.c perf.c perf_tcp.sh perfb.c server.c Log Message: got perf client / server tests running Index: Makefile.am =================================================================== RCS file: /cvsroot/freedce/freedce/perf/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile.am 11 Feb 2005 20:38:33 -0000 1.2 --- Makefile.am 27 Feb 2009 18:14:53 -0000 1.3 *************** *** 2,11 **** include $(top_srcdir)/include.mk ! IDLFLAGS+=-no_mepv -I$(IDL_INCLUDE_DIR)/.. -I$(top_builddir)/include $(DCETHREADINCLUDES) libs=$(top_builddir)/dcelib/libdcerpc.la \ ! $(top_builddir)/uuid/libuuid.la -lstdc++ \ ! $(top_builddir)/ncklib/transport/cn/libprot_ncacn.la \ ! $(top_builddir)/ncklib/transport/dg/libprot_ncadg.la EXTRA_PROGRAMS=client server --- 2,12 ---- include $(top_srcdir)/include.mk ! IDL_FLAGS=-I$(IDL_INCLUDE_DIR)/.. -I$(top_builddir)/include $(DCETHREADINCLUDES) ! IDLCC=-no_mepv -cc_cmd "$(CC) -D_BSD $(IDL_FLAGS) $(IDL_CFLAGS) -c" $(IDL_INCS) ! libs=$(top_builddir)/dcelib/libdcerpc.la \ ! $(top_builddir)/uuid/libuuid.la -lstdc++ + all: client server EXTRA_PROGRAMS=client server *************** *** 15,36 **** run_tests.sh: $(EXTRA_PROGRAMS) ! client_SOURCES=client.c ! server_SOURCES=server.c ! client_LDADD=util.o perf_cstub.o perfb_cstub.o perfc_sstub.o perfg.o perfg_cstub.o $(libs) ! server_LDADD=perf.o perf_sstub.o perfb_sstub.o perfc_cstub.o perfg.o perfg_sstub.o perfb.o util.o $(libs) #BUILT_SOURCES=perf.h perfb.h perfc.h perfg.h ! CLEANFILES=perf.h perfb.h perfc.h perfg.h server client perf_cstub.o perf_sstub.o perf.h: perf.idl ! $(IDL) $(IDLFLAGS) perf.idl perfb_cstub.o perfb_sstub.o perfb.h: perfb.idl ! $(IDL) $(IDLFLAGS) perfb.idl perfc_cstub.o perfc_sstub.o perfc.h: perfc.idl ! $(IDL) $(IDLFLAGS) perfc.idl perfg_cstub.o perfg_sstub.o perfg.h: perfg.idl ! $(IDL) $(IDLFLAGS) perfg.idl --- 16,43 ---- run_tests.sh: $(EXTRA_PROGRAMS) ! client_SOURCES=client.c ! server_SOURCES=server.c perf.c ! ! client_LDADD=perf_cstub.o perfb_cstub.o perfc_sstub.o perfg.o perfg_cstub.o util.o $(libs) ! server_LDADD=perf_sstub.o perfb_sstub.o perfc_cstub.o perfg.o perfg_sstub.o perfb.o util.o $(libs) #BUILT_SOURCES=perf.h perfb.h perfc.h perfg.h ! CLEANFILES=perf.h perfb.h perfc.h perfg.h server client \ ! perf_sstub.o perfb_sstub.o perfc_sstub.o perfg_sstub.o \ ! perf_cstub.o perfb_cstub.o perfc_cstub.o perfg_cstub.o ! ! server.c: perf.h perfb.h perfc.h perfg.h ! client.c: perf.h perfb.h perfc.h perfg.h perf_cstub.o perf_sstub.o perf.h: perf.idl ! $(IDL) $(IDLCC) perf.idl perfb_cstub.o perfb_sstub.o perfb.h: perfb.idl ! $(IDL) $(IDLCC) perfb.idl perfc_cstub.o perfc_sstub.o perfc.h: perfc.idl ! $(IDL) $(IDLCC) perfc.idl perfg_cstub.o perfg_sstub.o perfg.h: perfg.idl ! $(IDL) $(IDLCC) perfg.idl Index: client.c =================================================================== RCS file: /cvsroot/freedce/freedce/perf/client.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** client.c 28 Sep 2005 22:41:34 -0000 1.3 --- client.c 27 Feb 2009 18:14:53 -0000 1.4 *************** *** 36,39 **** --- 36,41 ---- */ + #include <dce/dce.h> + #include <perf_c.h> #include <string.h> *************** *** 816,824 **** } ! printf ("%ld interface ids returned for %s.\n", if_ids->count, pstring); for (i = 0; i < if_ids->count; i++) { uuid_to_string (&if_ids->if_id[i]->uuid, &uuid_string, &st); ! printf ("%ld:\tuuid:\t%s\n\tvers_major:\t%d\tvers_minor\t%d\n", (i+1), uuid_string, if_ids->if_id[i]->vers_major, if_ids->if_id[i]->vers_minor ); --- 818,826 ---- } ! printf ("%d interface ids returned for %s.\n", if_ids->count, pstring); for (i = 0; i < if_ids->count; i++) { uuid_to_string (&if_ids->if_id[i]->uuid, &uuid_string, &st); ! printf ("%d:\tuuid:\t%s\n\tvers_major:\t%d\tvers_minor\t%d\n", (i+1), uuid_string, if_ids->if_id[i]->vers_major, if_ids->if_id[i]->vers_minor ); *************** *** 891,898 **** rpc_string_free(&pstring, &st); ! printf(" Calls sent: %9lu\n", stats->stats[rpc_c_stats_calls_out]); ! printf(" Calls rcvd: %9lu\n", stats->stats[rpc_c_stats_calls_in]); ! printf(" Packets sent: %9lu\n", stats->stats[rpc_c_stats_pkts_out]); ! printf(" Packets rcvd: %9lu\n", stats->stats[rpc_c_stats_pkts_in]); rpc_mgmt_stats_vector_free (&stats, &st); --- 893,900 ---- rpc_string_free(&pstring, &st); ! printf(" Calls sent: %9u\n", stats->stats[rpc_c_stats_calls_out]); ! printf(" Calls rcvd: %9u\n", stats->stats[rpc_c_stats_calls_in]); ! printf(" Packets sent: %9u\n", stats->stats[rpc_c_stats_pkts_out]); ! printf(" Packets rcvd: %9u\n", stats->stats[rpc_c_stats_pkts_in]); rpc_mgmt_stats_vector_free (&stats, &st); *************** *** 1089,1093 **** if (sum != rsum) { ! fprintf(stderr, "*** Sum mismatch in large forwarded call (%lu, %lu)\n", sum, rsum); } --- 1091,1095 ---- if (sum != rsum) { ! fprintf(stderr, "*** Sum mismatch in large forwarded call (%u, %u)\n", sum, rsum); } *************** *** 1253,1257 **** { *c = ++callback_count; ! printf(" ...in callback %lu\n", *c); } --- 1255,1259 ---- { *c = ++callback_count; ! printf(" ...in callback %u\n", *c); } *************** *** 1263,1267 **** { *c = ++callback_count; ! printf(" ...in idempotent callback %lu\n", *c); } --- 1265,1269 ---- { *c = ++callback_count; ! printf(" ...in idempotent callback %u\n", *c); } *************** *** 1361,1365 **** if (x != 34) { ! fprintf(stderr, "*** op1 on Foo1 returned %lu instead of 34\n", x); } --- 1363,1367 ---- if (x != 34) { ! fprintf(stderr, "*** op1 on Foo1 returned %u instead of 34\n", x); } *************** *** 1369,1373 **** if (x != 15) { ! fprintf(stderr, "*** op2 on Bar2 returned %lu instead of 15\n", x); } --- 1371,1375 ---- if (x != 15) { ! fprintf(stderr, "*** op2 on Bar2 returned %u instead of 15\n", x); } *************** *** 1377,1381 **** if (x != 222) { ! fprintf(stderr, "*** op1 on Foo2 returned %lu instead of 222\n", x); } --- 1379,1383 ---- if (x != 222) { ! fprintf(stderr, "*** op1 on Foo2 returned %u instead of 222\n", x); } *************** *** 1385,1389 **** if (x != 65) { ! fprintf(stderr, "*** op2 on Bar1 returned %lu instead of 65\n", x); } --- 1387,1391 ---- if (x != 65) { ! fprintf(stderr, "*** op2 on Bar1 returned %u instead of 65\n", x); } *************** *** 1809,1813 **** if (rdata != data) { ! fprintf (stderr, "*** data mismatch on data returned by perf_get_context; %lu != %lu\n", rdata, data); } --- 1811,1815 ---- if (rdata != data) { ! fprintf (stderr, "*** data mismatch on data returned by perf_get_context; %u != %u\n", rdata, data); } *************** *** 1829,1833 **** if (rdata != data) { ! fprintf (stderr, "*** data mismatch on data returned by perf_free_context; %lu != %lu\n", rdata, data); } --- 1831,1835 ---- if (rdata != data) { ! fprintf (stderr, "*** data mismatch on data returned by perf_free_context; %u != %u\n", rdata, data); } *************** *** 1963,1967 **** } len = atoi(argv[7]) / 4; ! printf("; bytes/call: %ld", len * 4); break; case 10: --- 1965,1969 ---- } len = atoi(argv[7]) / 4; ! printf("; bytes/call: %d", len * 4); break; case 10: *************** *** 1985,1989 **** } } ! printf("; sleep secs: %ld; mode: %s", slow_secs, slow_mode_names[slow_mode]); break; --- 1987,1991 ---- } } ! printf("; sleep secs: %d; mode: %s", slow_secs, slow_mode_names[slow_mode]); break; *************** *** 2062,2066 **** if (sum != rsum) { ! fprintf(stderr, "*** Sum mismatch (%lu, %lu)\n", sum, rsum); } --- 2064,2068 ---- if (sum != rsum) { ! fprintf(stderr, "*** Sum mismatch (%u, %u)\n", sum, rsum); } *************** *** 2085,2089 **** { fprintf(stderr, ! "*** Output length (%lu) is not equal to input length (%lu)\n", tlen, len); exit(1); } --- 2087,2091 ---- { fprintf(stderr, ! "*** Output length (%u) is not equal to input length (%u)\n", tlen, len); exit(1); } *************** *** 2102,2106 **** if (sum != rsum) { ! fprintf(stderr, "*** Sum mismatch (%lu, %lu)\n", sum, rsum); } --- 2104,2108 ---- if (sum != rsum) { ! fprintf(stderr, "*** Sum mismatch (%u, %u)\n", sum, rsum); } *************** *** 2178,2182 **** if (n_calls != cpp) { ! fprintf(stderr, "*** Call count mismatch (%lu, %d)\n", n_calls, cpp); } --- 2180,2184 ---- if (n_calls != cpp) { ! fprintf(stderr, "*** Call count mismatch (%u, %d)\n", n_calls, cpp); } *************** *** 2184,2188 **** #ifdef NO_TIMES ! printf(" pass %3d; ms/call: %lu.%03u", pass, avg_time.msec, avg_time.usec); --- 2186,2190 ---- #ifdef NO_TIMES ! printf(" pass %3d; ms/call: %u.%03u", pass, avg_time.msec, avg_time.usec); *************** *** 2267,2271 **** #ifdef NO_TIMES ! printf(" ms: %lu.%03u\n", avg_time.msec, avg_time.usec); #else printf(" ms: %lu.%03lu (%lu/%lu)\n", --- 2269,2273 ---- #ifdef NO_TIMES ! printf(" ms: %u.%03lu\n", avg_time.msec, avg_time.usec); #else printf(" ms: %lu.%03lu (%lu/%lu)\n", *************** *** 2279,2282 **** --- 2281,2286 ---- */ + #if 0 + /* these are dynamically loadable now - cannot be called direct */ void rpc__cn_set_sock_buffsize ( unsigned32 /* rsize */, *************** *** 2287,2290 **** --- 2291,2295 ---- unsigned32 * /* ssize */, error_status_t * /* st */); + #endif static void start_test(test, argc, argv) *************** *** 2297,2304 **** error_status_t status; rpc__cn_set_sock_buffsize(socket_buf_size, socket_buf_size, &status); if (status != rpc_s_ok) { ! fprintf(stderr,"*** rpc__cn_set_sock_buffsize failed (0x%lx)\n", status); exit(1); } --- 2302,2311 ---- error_status_t status; + /* these are dynamically loadable now - cannot be called direct */ + #if 0 rpc__cn_set_sock_buffsize(socket_buf_size, socket_buf_size, &status); if (status != rpc_s_ok) { ! fprintf(stderr,"*** rpc__cn_set_sock_buffsize failed (0x%x)\n", status); exit(1); } *************** *** 2307,2311 **** if (status != rpc_s_ok) { ! fprintf(stderr,"*** rpc__cn_inq_sock_buffsize failed (0x%lx)\n", status); exit(1); } --- 2314,2318 ---- if (status != rpc_s_ok) { ! fprintf(stderr,"*** rpc__cn_inq_sock_buffsize failed (0x%x)\n", status); exit(1); } *************** *** 2313,2320 **** { fprintf(stderr, "*** CN socket buffer sizes dont match:\n"); ! fprintf(stderr, "*** READ desired: %lu actual: %lu\n", socket_buf_size, rsize); ! fprintf(stderr, "*** WRITE desired: %lu actual: %lu\n", socket_buf_size, ssize); exit(1); } TRY --- 2320,2328 ---- { fprintf(stderr, "*** CN socket buffer sizes dont match:\n"); ! fprintf(stderr, "*** READ desired: %u actual: %u\n", socket_buf_size, rsize); ! fprintf(stderr, "*** WRITE desired: %u actual: %u\n", socket_buf_size, ssize); exit(1); } + #endif TRY *************** *** 2448,2452 **** TRY { ! sys_pthread_create(&tasks[i], sys_pthread_attr_default, (pthread_startroutine_t) multi_task, (pthread_addr_t) info); } CATCH_ALL { --- 2456,2460 ---- TRY { ! sys_pthread_create(&tasks[i], &sys_pthread_attr_default, (pthread_startroutine_t) multi_task, (pthread_addr_t) info); } CATCH_ALL { *************** *** 2735,2739 **** { #ifdef _POSIX_THREADS ! pthread_mutex_init(&global_mutex, sys_pthread_mutexattr_default); if (multithread) --- 2743,2747 ---- { #ifdef _POSIX_THREADS ! pthread_mutex_init(&global_mutex, &sys_pthread_mutexattr_default); if (multithread) Index: perf.c =================================================================== RCS file: /cvsroot/freedce/freedce/perf/perf.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** perf.c 28 Sep 2005 22:41:34 -0000 1.3 --- perf.c 27 Feb 2009 18:14:53 -0000 1.4 *************** *** 36,39 **** --- 36,40 ---- ** */ + #include <dce/dce.h> #include <stdlib.h> #include <string.h> *************** *** 286,290 **** common(); n_brd++; ! gethostname(name, 256); } --- 287,291 ---- common(); n_brd++; ! gethostname((char*)name, 256); } *************** *** 584,588 **** { case perf_slow_sleep: ! printf("+ Sleeping for %lu seconds...\n", secs); SLEEP(secs); printf(" ...awake!\n"); --- 585,589 ---- { case perf_slow_sleep: ! printf("+ Sleeping for %u seconds...\n", secs); SLEEP(secs); printf(" ...awake!\n"); *************** *** 590,594 **** case perf_slow_cpu: ! printf("+ CPU looping for %lu seconds...\n", secs); while ((unsigned32)(time(0) - start_time) < secs) { --- 591,595 ---- case perf_slow_cpu: ! printf("+ CPU looping for %u seconds...\n", secs); while ((unsigned32)(time(0) - start_time) < secs) { *************** *** 608,612 **** t = (char *) mktemp(TempFileName); ! printf("+ Writing file \"%s\" (size=%ld bytes)\n", t, secs); f = open(t, (O_TRUNC | O_RDWR | O_CREAT), 0777); if (f < 0) --- 609,613 ---- t = (char *) mktemp(TempFileName); ! printf("+ Writing file \"%s\" (size=%d bytes)\n", t, secs); f = open(t, (O_TRUNC | O_RDWR | O_CREAT), 0777); if (f < 0) *************** *** 651,656 **** pid_t pid; char buf[16]; ! printf("+ Forking sleep for %lu seconds...\n", secs); ! sprintf(buf, "%lu", secs); cpid = fork(); if (cpid == 0) --- 652,657 ---- pid_t pid; char buf[16]; ! printf("+ Forking sleep for %u seconds...\n", secs); ! sprintf(buf, "%u", secs); cpid = fork(); if (cpid == 0) *************** *** 790,794 **** printf ("+ Shutdown thread...\n"); ! printf (" sleeping for %lu seconds\n", p->secs); SLEEP (p->secs); --- 791,795 ---- printf ("+ Shutdown thread...\n"); ! printf (" sleeping for %u seconds\n", p->secs); SLEEP (p->secs); *************** *** 831,837 **** p->secs = secs; ! sys_pthread_create (&thread, sys_pthread_attr_default, shutdown_thread, (void *) p); ! sys_pthread_detach (&thread); } --- 832,838 ---- p->secs = secs; ! sys_pthread_create (&thread, &sys_pthread_attr_default, shutdown_thread, (void *) p); ! sys_pthread_detach (thread); } *************** *** 876,880 **** if ((! idem) && c != passes) { ! printf(" ...count mismatch [%lu, %lu]\n", c, passes); st = 1; #ifdef NOTDEF --- 877,881 ---- if ((! idem) && c != passes) { ! printf(" ...count mismatch [%u, %u]\n", c, passes); st = 1; #ifdef NOTDEF Index: perf_tcp.sh =================================================================== RCS file: /cvsroot/freedce/freedce/perf/perf_tcp.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** perf_tcp.sh 26 Jul 2001 18:53:01 -0000 1.2 --- perf_tcp.sh 27 Feb 2009 18:14:53 -0000 1.3 *************** *** 41,59 **** echo "client 0a" ! client 0 "ncacn_ip_tcp:${IP}[2001]" 3 40 y y || FAILED="$FAILED 0a" echo "client 0b" ! client 0 "ncacn_ip_tcp:${IP}[2001]" 3 40 y n || FAILED="$FAILED 0b" echo "client 0c" ! client 0 "ncacn_ip_tcp:${IP}[2001]" 3 40 n y || FAILED="$FAILED 0c" echo "client 0d" ! client 0 "ncacn_ip_tcp:${IP}[2001]" 3 40 n n || FAILED="$FAILED 0d" echo "client 1a" ! client 1 "ncacn_ip_tcp:${IP}[2001]" 3 40 y y 400 || FAILED="$FAILED 1a" echo "client 1b" ! client 1 "ncacn_ip_tcp:${IP}[2001]" 3 40 y n 400 || FAILED="$FAILED 1b" echo "client 1c" ! client 1 "ncacn_ip_tcp:${IP}[2001]" 3 10 y y 4000 || FAILED="$FAILED 1c" echo "client 1d" ! client 1 "ncacn_ip_tcp:${IP}[2001]" 3 10 y n 4000 || FAILED="$FAILED 1d" #echo "client 1e" #client 1 "ncacn_ip_tcp:${IP}[2001]" 3 2 y y 100000 || FAILED="$FAILED 1e" --- 41,59 ---- echo "client 0a" ! ./client 0 "ncacn_ip_tcp:${IP}[2001]" 3 40 y y || FAILED="$FAILED 0a" echo "client 0b" ! ./client 0 "ncacn_ip_tcp:${IP}[2001]" 3 40 y n || FAILED="$FAILED 0b" echo "client 0c" ! ./client 0 "ncacn_ip_tcp:${IP}[2001]" 3 40 n y || FAILED="$FAILED 0c" echo "client 0d" ! ./client 0 "ncacn_ip_tcp:${IP}[2001]" 3 40 n n || FAILED="$FAILED 0d" echo "client 1a" ! ./client 1 "ncacn_ip_tcp:${IP}[2001]" 3 40 y y 400 || FAILED="$FAILED 1a" echo "client 1b" ! ./client 1 "ncacn_ip_tcp:${IP}[2001]" 3 40 y n 400 || FAILED="$FAILED 1b" echo "client 1c" ! ./client 1 "ncacn_ip_tcp:${IP}[2001]" 3 10 y y 4000 || FAILED="$FAILED 1c" echo "client 1d" ! ./client 1 "ncacn_ip_tcp:${IP}[2001]" 3 10 y n 4000 || FAILED="$FAILED 1d" #echo "client 1e" #client 1 "ncacn_ip_tcp:${IP}[2001]" 3 2 y y 100000 || FAILED="$FAILED 1e" *************** *** 61,71 **** #client 1 "ncacn_ip_tcp:${IP}[2001]" 3 2 y n 100000 || FAILED="$FAILED 1f" echo "client 2a" ! client 2 "ncacn_ip_tcp:${IP}[2001]" 3 100 y y 400 || FAILED="$FAILED 2a" echo "client 2b" ! client 2 "ncacn_ip_tcp:${IP}[2001]" 3 100 y n 400 || FAILED="$FAILED 2b" echo "client 2c" ! client 2 "ncacn_ip_tcp:${IP}[2001]" 3 10 y y 4000 || FAILED="$FAILED 2c" echo "client 2d" ! client 2 "ncacn_ip_tcp:${IP}[2001]" 3 10 y n 4000 || FAILED="$FAILED 2d" #echo "client 2e" #client 2 "ncacn_ip_tcp:${IP}[2001]" 3 2 y y 100000 || FAILED="$FAILED 2e" --- 61,71 ---- #client 1 "ncacn_ip_tcp:${IP}[2001]" 3 2 y n 100000 || FAILED="$FAILED 1f" echo "client 2a" ! ./client 2 "ncacn_ip_tcp:${IP}[2001]" 3 100 y y 400 || FAILED="$FAILED 2a" echo "client 2b" ! ./client 2 "ncacn_ip_tcp:${IP}[2001]" 3 100 y n 400 || FAILED="$FAILED 2b" echo "client 2c" ! ./client 2 "ncacn_ip_tcp:${IP}[2001]" 3 10 y y 4000 || FAILED="$FAILED 2c" echo "client 2d" ! ./client 2 "ncacn_ip_tcp:${IP}[2001]" 3 10 y n 4000 || FAILED="$FAILED 2d" #echo "client 2e" #client 2 "ncacn_ip_tcp:${IP}[2001]" 3 2 y y 100000 || FAILED="$FAILED 2e" *************** *** 75,103 **** #client 3 "ncacn_ip_tcp" || FAILED="$FAILED 3" echo "client 4" ! client 4 "ncacn_ip_tcp:${IP}[2001]" 3 2 || FAILED="$FAILED 4" #echo "client 5" #client 5 "ncacn_ip_tcp" || FAILED="$FAILED 5" echo "client 6a" ! client 6 "ncacn_ip_tcp:${IP}[2001]" 3 100 y y || FAILED="$FAILED 6a" echo "client 6b" ! client 6 "ncacn_ip_tcp:${IP}[2001]" 3 100 y n || FAILED="$FAILED 6b" echo "client 8" ! client 8 "ncacn_ip_tcp:${IP}[2001]" y || FAILED="$FAILED 8" echo "client 7" ! client 7 "ncacn_ip_tcp:${IP}[2001]" || FAILED="$FAILED 7" echo "client 9" ! client 9 "ncacn_ip_tcp:${IP}[2001]" || FAILED="$FAILED 9" echo "client 10a" ! client 10 "ncacn_ip_tcp:${IP}[2001]" 4 3 y y 2 || FAILED="$FAILED 10a" echo "client 10b" ! client 10 "ncacn_ip_tcp:${IP}[2001]" 2 3 y n 2 || FAILED="$FAILED 10b" echo "client 10c" ! client 10 "ncacn_ip_tcp:${IP}[2001]" 4 3 y y 2 1 || FAILED="$FAILED 10c" echo "client 10d" ! client 10 "ncacn_ip_tcp:${IP}[2001]" 2 3 y n 2 1 || FAILED="$FAILED 10d" echo "client 10e" ! client 10 "ncacn_ip_tcp:${IP}[2001]" 4 3 y y 2 2 || FAILED="$FAILED 10e" echo "client 10f" ! client 10 "ncacn_ip_tcp:${IP}[2001]" 2 3 y n 2 2 || FAILED="$FAILED 10f" # These test are unsupported and will fail #echo "client 12a" --- 75,103 ---- #client 3 "ncacn_ip_tcp" || FAILED="$FAILED 3" echo "client 4" ! ./client 4 "ncacn_ip_tcp:${IP}[2001]" 3 2 || FAILED="$FAILED 4" #echo "client 5" #client 5 "ncacn_ip_tcp" || FAILED="$FAILED 5" echo "client 6a" ! ./client 6 "ncacn_ip_tcp:${IP}[2001]" 3 100 y y || FAILED="$FAILED 6a" echo "client 6b" ! ./client 6 "ncacn_ip_tcp:${IP}[2001]" 3 100 y n || FAILED="$FAILED 6b" echo "client 8" ! ./client 8 "ncacn_ip_tcp:${IP}[2001]" y || FAILED="$FAILED 8" echo "client 7" ! ./client 7 "ncacn_ip_tcp:${IP}[2001]" || FAILED="$FAILED 7" echo "client 9" ! ./client 9 "ncacn_ip_tcp:${IP}[2001]" || FAILED="$FAILED 9" echo "client 10a" ! ./client 10 "ncacn_ip_tcp:${IP}[2001]" 4 3 y y 2 || FAILED="$FAILED 10a" echo "client 10b" ! ./client 10 "ncacn_ip_tcp:${IP}[2001]" 2 3 y n 2 || FAILED="$FAILED 10b" echo "client 10c" ! ./client 10 "ncacn_ip_tcp:${IP}[2001]" 4 3 y y 2 1 || FAILED="$FAILED 10c" echo "client 10d" ! ./client 10 "ncacn_ip_tcp:${IP}[2001]" 2 3 y n 2 1 || FAILED="$FAILED 10d" echo "client 10e" ! ./client 10 "ncacn_ip_tcp:${IP}[2001]" 4 3 y y 2 2 || FAILED="$FAILED 10e" echo "client 10f" ! ./client 10 "ncacn_ip_tcp:${IP}[2001]" 2 3 y n 2 2 || FAILED="$FAILED 10f" # These test are unsupported and will fail #echo "client 12a" *************** *** 106,122 **** #client 12 "ncacn_ip_tcp:${IP}[2001]" 2 10 n echo "client 13" ! client 13 "ncacn_ip_tcp:${IP}[2001]" || FAILED="$FAILED 13" echo "client 14a" ! client 14 "ncacn_ip_tcp:${IP}[2001]" 4 n 1 || FAILED="$FAILED 14a" echo "client 14b" ! client 14 "ncacn_ip_tcp:${IP}[2001]" 4 y 1 || FAILED="$FAILED 14b" echo "client 15a" ! client 15 "ncacn_ip_tcp:${IP}[2001]" 2 y 1 || FAILED="$FAILED 15a" echo "client 15b" ! client 15 "ncacn_ip_tcp:${IP}[2001]" 2 n 1 || FAILED="$FAILED 15b" echo "client 15c" ! client 15 "ncacn_ip_tcp:${IP}[2001]" 2 y 1 5 || FAILED="$FAILED 15c" echo "client 15d" ! client 15 "ncacn_ip_tcp:${IP}[2001]" 2 n 1 5 || FAILED="$FAILED 15d" if [ -n "$FAILED" ] ; then --- 106,122 ---- #client 12 "ncacn_ip_tcp:${IP}[2001]" 2 10 n echo "client 13" ! ./client 13 "ncacn_ip_tcp:${IP}[2001]" || FAILED="$FAILED 13" echo "client 14a" ! ./client 14 "ncacn_ip_tcp:${IP}[2001]" 4 n 1 || FAILED="$FAILED 14a" echo "client 14b" ! ./client 14 "ncacn_ip_tcp:${IP}[2001]" 4 y 1 || FAILED="$FAILED 14b" echo "client 15a" ! ./client 15 "ncacn_ip_tcp:${IP}[2001]" 2 y 1 || FAILED="$FAILED 15a" echo "client 15b" ! ./client 15 "ncacn_ip_tcp:${IP}[2001]" 2 n 1 || FAILED="$FAILED 15b" echo "client 15c" ! ./client 15 "ncacn_ip_tcp:${IP}[2001]" 2 y 1 5 || FAILED="$FAILED 15c" echo "client 15d" ! ./client 15 "ncacn_ip_tcp:${IP}[2001]" 2 n 1 5 || FAILED="$FAILED 15d" if [ -n "$FAILED" ] ; then Index: perfb.c =================================================================== RCS file: /cvsroot/freedce/freedce/perf/perfb.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** perfb.c 26 Jul 2001 18:53:01 -0000 1.2 --- perfb.c 27 Feb 2009 18:14:53 -0000 1.3 *************** *** 72,76 **** { print_binding_info ("perfb_init", h); ! gethostname(name, 256); } --- 72,76 ---- { print_binding_info ("perfb_init", h); ! gethostname((char*)name, 256); } *************** *** 114,118 **** { print_binding_info ("perfb_brd", h); ! gethostname(name, 256); } --- 114,118 ---- { print_binding_info ("perfb_brd", h); ! gethostname((char*)name, 256); } Index: server.c =================================================================== RCS file: /cvsroot/freedce/freedce/perf/server.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** server.c 26 Jul 2001 18:53:01 -0000 1.2 --- server.c 27 Feb 2009 18:14:53 -0000 1.3 *************** *** 101,105 **** b = (op == rpc_c_mgmt_stop_server_listen) ? shut_ok : true; ! VRprintf (1, ("+ In management authorization function: op=%lu, returning \"%s\"\n", op, b ? "true" : "false")); --- 101,105 ---- b = (op == rpc_c_mgmt_stop_server_listen) ? shut_ok : true; ! VRprintf (1, ("+ In management authorization function: op=%u, returning \"%s\"\n", op, b ? "true" : "false")); *************** *** 394,398 **** if (st != rpc_s_ok) { ! fprintf(stderr, "*** Can't inq_bindings - %lx\n", st); exit(1); } --- 394,398 ---- if (st != rpc_s_ok) { ! fprintf(stderr, "*** Can't inq_bindings - %x\n", st); exit(1); } *************** *** 406,410 **** if (st != rpc_s_ok) { ! fprintf(stderr, "*** Can't get string binding - %lx\n", st); exit(1); } --- 406,410 ---- if (st != rpc_s_ok) { ! fprintf(stderr, "*** Can't get string binding - %x\n", st); exit(1); } *************** *** 557,560 **** --- 557,562 ---- unsigned32 * /*st*/ ); + #if 0 + /* cannot use these direct, they are dynamically loaded now */ void rpc__cn_set_sock_buffsize ( unsigned32 /* rsize */, *************** *** 565,569 **** unsigned32 * /* ssize */, error_status_t * /* st */); ! extern int lookup_name(char *table[], char *s); --- 567,571 ---- unsigned32 * /* ssize */, error_status_t * /* st */); ! #endif extern int lookup_name(char *table[], char *s); *************** *** 697,700 **** --- 699,703 ---- } + #if 0 rpc__cn_set_sock_buffsize(socket_buf_size, socket_buf_size, &st); if (st != rpc_s_ok) *************** *** 717,720 **** --- 720,724 ---- exit(1); } + #endif rpc_mgmt_set_authorization_fn(mgmt_auth_fn, &st); |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 18:14:30
|
Update of /cvsroot/freedce/freedce/idl In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15540 Modified Files: ast.h ddspell.c hdgen.c ifspemts.c Log Message: more 64-bitisms Index: ast.h =================================================================== RCS file: /cvsroot/freedce/freedce/idl/ast.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** ast.h 18 Jan 2005 23:06:23 -0000 1.3 --- ast.h 27 Feb 2009 18:14:14 -0000 1.4 *************** *** 881,888 **** char char_val; boolean boolean_val; ! long int int_val; struct { ! long int high; ! unsigned long int low; } hyper_int_val; } value; --- 881,888 ---- char char_val; boolean boolean_val; ! int int_val; struct { ! int high; ! unsigned int low; } hyper_int_val; } value; Index: ddspell.c =================================================================== RCS file: /cvsroot/freedce/freedce/idl/ddspell.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** ddspell.c 26 Jul 2001 18:53:00 -0000 1.4 --- ddspell.c 27 Feb 2009 18:14:16 -0000 1.5 *************** *** 109,123 **** #ifdef PROTO ( ! long val /* [in] long value */ ) #else (val) ! long val; /* [in] long value */ #endif { if (DDBE_stub_hex) ! sprintf(DDBE_long_buf, "0x%04lx", val); else ! sprintf(DDBE_long_buf, "%6ld", val); return DDBE_long_buf; --- 109,123 ---- #ifdef PROTO ( ! int val /* [in] long value */ ) #else (val) ! int val; /* [in] long value */ #endif { if (DDBE_stub_hex) ! sprintf(DDBE_long_buf, "0x%04x", val); else ! sprintf(DDBE_long_buf, "%6d", val); return DDBE_long_buf; *************** *** 127,141 **** #ifdef PROTO ( ! long val /* [in] long value */ ) #else (val) ! long val; /* [in] long value */ #endif { if (DDBE_stub_hex) ! sprintf(DDBE_long_buf, "0x%lx", val); else ! sprintf(DDBE_long_buf, "%ld", val); return DDBE_long_buf; --- 127,141 ---- #ifdef PROTO ( ! int val /* [in] long value */ ) #else (val) ! int val; /* [in] long value */ #endif { if (DDBE_stub_hex) ! sprintf(DDBE_long_buf, "0x%x", val); else ! sprintf(DDBE_long_buf, "%d", val); return DDBE_long_buf; *************** *** 223,227 **** ( FILE *fid, /* [in] output file handle */ ! unsigned long *val, /* [in] value to print */ boolean little_endian __attribute__((__unused__)) /* [in] T/F => spell as little/big endian */ ) --- 223,227 ---- ( FILE *fid, /* [in] output file handle */ ! unsigned int *val, /* [in] value to print */ boolean little_endian __attribute__((__unused__)) /* [in] T/F => spell as little/big endian */ ) *************** *** 229,233 **** (fid, val, little_endian) FILE *fid; /* [in] output file handle */ ! unsigned long *val; /* [in] value to print */ boolean little_endian; /* [in] T/F => spell as little/big endian */ #endif --- 229,233 ---- (fid, val, little_endian) FILE *fid; /* [in] output file handle */ ! unsigned int *val; /* [in] value to print */ boolean little_endian; /* [in] T/F => spell as little/big endian */ #endif *************** *** 854,858 **** DDBE_vec_rep_t *vec_p; /* Ptr to offset vector entry list */ AST_type_n_t *type_p; /* Ptr to AST type node */ ! unsigned long last_index; /* Last index spelled */ char const *inst_name; /* Name of generated instance of type */ #ifdef DUMPERS --- 854,858 ---- DDBE_vec_rep_t *vec_p; /* Ptr to offset vector entry list */ AST_type_n_t *type_p; /* Ptr to AST type node */ ! unsigned int last_index; /* Last index spelled */ char const *inst_name; /* Name of generated instance of type */ #ifdef DUMPERS *************** *** 1037,1042 **** byte *bp; /* Pointer to byte stream */ char *getenvres; /* Environment variable translation */ ! unsigned long index; /* Type vector index */ ! unsigned long longint; /* 4-byte integer data */ unsigned short shortint; /* 2-byte integer data */ boolean spell_stg_info; /* TRUE => spell storage information list */ --- 1037,1042 ---- byte *bp; /* Pointer to byte stream */ char *getenvres; /* Environment variable translation */ ! unsigned int index; /* Type vector index */ ! unsigned int longint; /* 4-byte integer data */ unsigned short shortint; /* 2-byte integer data */ boolean spell_stg_info; /* TRUE => spell storage information list */ *************** *** 1296,1300 **** #endif { ! unsigned long size,index,longint; /* 4-byte integer data */ byte *p4; /* Pointer to 4-byte integer */ boolean *do_bug; /* Pointer to array of bug flags */ --- 1296,1300 ---- #endif { ! unsigned int size,index,longint; /* 4-byte integer data */ byte *p4; /* Pointer to 4-byte integer */ boolean *do_bug; /* Pointer to array of bug flags */ *************** *** 1562,1566 **** DDBE_oper_i_t *oper_i_p; /* Ptr to operation info node */ AST_parameter_n_t *param_p; /* Ptr to AST parameter node */ ! unsigned long param_num; /* Parameter number */ char const *param_name; /* Parameter name */ --- 1562,1566 ---- DDBE_oper_i_t *oper_i_p; /* Ptr to operation info node */ AST_parameter_n_t *param_p; /* Ptr to AST parameter node */ ! unsigned int param_num; /* Parameter number */ char const *param_name; /* Parameter name */ *************** *** 1583,1587 **** { NAMETABLE_id_to_string(param_p->name, ¶m_name); ! fprintf(fid, "idl_short_float IDL_short_float_%ld = %s;\n", param_num, param_name); } --- 1583,1587 ---- { NAMETABLE_id_to_string(param_p->name, ¶m_name); ! fprintf(fid, "idl_short_float IDL_short_float_%d = %s;\n", param_num, param_name); } *************** *** 1616,1620 **** AST_parameter_n_t *param_p; /* Ptr to AST parameter node */ DDBE_oper_i_t *oper_i_p; /* Ptr to operation info node */ ! unsigned long param_num; /* Parameter number */ char const *param_name; /* Parameter name */ boolean spell_value; /* TRUE => spell param value not address */ --- 1616,1620 ---- AST_parameter_n_t *param_p; /* Ptr to AST parameter node */ DDBE_oper_i_t *oper_i_p; /* Ptr to operation info node */ ! unsigned int param_num; /* Parameter number */ char const *param_name; /* Parameter name */ boolean spell_value; /* TRUE => spell param value not address */ *************** *** 1646,1650 **** NAMETABLE_id_to_string(param_p->name, ¶m_name); ! fprintf(fid, "%sparam_vec[%ld] = (rpc_void_p_t)", DDBE_PREFIX_IDL, param_num); --- 1646,1650 ---- NAMETABLE_id_to_string(param_p->name, ¶m_name); ! fprintf(fid, "%sparam_vec[%d] = (rpc_void_p_t)", DDBE_PREFIX_IDL, param_num); *************** *** 1664,1668 **** && side == BE_client_side) { ! fprintf(fid, "&IDL_short_float_%ld;\n", param_num); } else --- 1664,1668 ---- && side == BE_client_side) { ! fprintf(fid, "&IDL_short_float_%d;\n", param_num); } else Index: hdgen.c =================================================================== RCS file: /cvsroot/freedce/freedce/idl/hdgen.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** hdgen.c 26 Jul 2001 18:53:00 -0000 1.3 --- hdgen.c 27 Feb 2009 18:14:16 -0000 1.4 *************** *** 121,128 **** case AST_int_const_k: /*fprintf (fid, "(%ld)", cp->value.int_val);*/ ! fprintf (fid, "(0x%lx)", cp->value.int_val); /* prevent signed-edness problems with cxx */ break; case AST_hyper_int_const_k: ! fprintf (fid, "{%ld,%lu}", cp->value.hyper_int_val.high, cp->value.hyper_int_val.low); --- 121,128 ---- case AST_int_const_k: /*fprintf (fid, "(%ld)", cp->value.int_val);*/ ! fprintf (fid, "(0x%x)", cp->value.int_val); /* prevent signed-edness problems with cxx */ break; case AST_hyper_int_const_k: ! fprintf (fid, "{%d,%u}", cp->value.hyper_int_val.high, cp->value.hyper_int_val.low); Index: ifspemts.c =================================================================== RCS file: /cvsroot/freedce/freedce/idl/ifspemts.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** ifspemts.c 26 Sep 2000 21:14:21 -0000 1.2 --- ifspemts.c 27 Feb 2009 18:14:16 -0000 1.3 *************** *** 172,176 **** fprintf(fid, "0x%8.8xu, ", ifp->uuid.time_low); #else ! fprintf(fid, "0x%8.8lxu, ", ifp->uuid.time_low); #endif fprintf(fid, "0x%4.4x, ", ifp->uuid.time_mid); --- 172,176 ---- fprintf(fid, "0x%8.8xu, ", ifp->uuid.time_low); #else ! fprintf(fid, "0x%8.8xu, ", ifp->uuid.time_low); #endif fprintf(fid, "0x%4.4x, ", ifp->uuid.time_mid); |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:40
|
Update of /cvsroot/freedce/freedce/ncklib/transport In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443/ncklib/transport Modified Files: comsoc_bsd.c Log Message: lots of 64-bit-isms Index: comsoc_bsd.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/transport/comsoc_bsd.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** comsoc_bsd.c 2 Oct 2005 17:14:57 -0000 1.8 --- comsoc_bsd.c 27 Feb 2009 16:48:55 -0000 1.9 *************** *** 456,464 **** ((int) sock, NULL, NULL); #else ! int addrlen; addrlen = 0; *newsock = accept ! ((int) sock, (struct sockaddr *) NULL, (int *) &addrlen); #endif } --- 456,464 ---- ((int) sock, NULL, NULL); #else ! unsigned int addrlen; addrlen = 0; *newsock = accept ! ((int) sock, (struct sockaddr *) NULL, &addrlen); #endif } *************** *** 467,471 **** RPC_SOCKET_FIX_ADDRLEN(addr); *newsock = accept ! ((int) sock, (struct sockaddr *) (&addr->sa), (int *) (&addr->len)); RPC_SOCKET_FIX_ADDRLEN(addr); } --- 467,471 ---- RPC_SOCKET_FIX_ADDRLEN(addr); *newsock = accept ! ((int) sock, (struct sockaddr *) (&addr->sa), (&addr->len)); RPC_SOCKET_FIX_ADDRLEN(addr); } *************** *** 649,653 **** RPC_LOG_SOCKET_INQ_EP_NTR; RPC_SOCKET_FIX_ADDRLEN(addr); ! serr = (getsockname(sock, (void*)&addr->sa, (int*)&addr->len) == -1) ? socket_error : RPC_C_SOCKET_OK; RPC_SOCKET_FIX_ADDRLEN(addr); RPC_LOG_SOCKET_INQ_EP_XIT; --- 649,653 ---- RPC_LOG_SOCKET_INQ_EP_NTR; RPC_SOCKET_FIX_ADDRLEN(addr); ! serr = (getsockname(sock, (void*)&addr->sa, (unsigned int*)&addr->len) == -1) ? socket_error : RPC_C_SOCKET_OK; RPC_SOCKET_FIX_ADDRLEN(addr); RPC_LOG_SOCKET_INQ_EP_XIT; *************** *** 773,777 **** *ntxsize = 0; sizelen = sizeof *ntxsize; ! e = getsockopt(sock, SOL_SOCKET, SO_SNDBUF, ntxsize, (int *)&sizelen); if (e == -1) { --- 773,777 ---- *ntxsize = 0; sizelen = sizeof *ntxsize; ! e = getsockopt(sock, SOL_SOCKET, SO_SNDBUF, ntxsize, (unsigned int *)&sizelen); if (e == -1) { *************** *** 783,787 **** *nrxsize = 0; sizelen = sizeof *nrxsize; ! e = getsockopt(sock, SOL_SOCKET, SO_RCVBUF, nrxsize, (int *)&sizelen); if (e == -1) { --- 783,787 ---- *nrxsize = 0; sizelen = sizeof *nrxsize; ! e = getsockopt(sock, SOL_SOCKET, SO_RCVBUF, nrxsize, (unsigned int *)&sizelen); if (e == -1) { *************** *** 936,940 **** RPC_SOCKET_FIX_ADDRLEN(addr); ! serr = (getpeername(sock, (void*)&addr->sa, (int*)&addr->len) == -1) ? socket_error : RPC_C_SOCKET_OK; RPC_SOCKET_FIX_ADDRLEN(addr); --- 936,940 ---- RPC_SOCKET_FIX_ADDRLEN(addr); ! serr = (getpeername(sock, (void*)&addr->sa, (unsigned int*)&addr->len) == -1) ? socket_error : RPC_C_SOCKET_OK; RPC_SOCKET_FIX_ADDRLEN(addr); *************** *** 962,966 **** #endif { ! int optlen; optlen = sizeof(rpc_network_if_id_t); --- 962,966 ---- #endif { ! unsigned int optlen; optlen = sizeof(rpc_network_if_id_t); |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:40
|
Update of /cvsroot/freedce/freedce/ncklib/naf In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443/ncklib/naf Modified Files: ipnaf.c ipnaf_linux.c twr_uxd.c Log Message: lots of 64-bit-isms Index: ipnaf.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/naf/ipnaf.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** ipnaf.c 1 Oct 2005 21:11:23 -0000 1.10 --- ipnaf.c 27 Feb 2009 16:48:54 -0000 1.11 *************** *** 804,808 **** ret = RPC__IP_ENDPOINT_SSCANF((char *) endpoint, "%d", &ep); #else ! ret = RPC__IP_ENDPOINT_SSCANF((char *) endpoint, "%ld", &ep); #endif --- 804,808 ---- ret = RPC__IP_ENDPOINT_SSCANF((char *) endpoint, "%d", &ep); #else ! ret = RPC__IP_ENDPOINT_SSCANF((char *) endpoint, "%d", &ep); #endif *************** *** 1016,1020 **** * formatted unsigned32 - check for validity */ ! ip_addr->sa.sin_addr.s_addr = inet_addr (netaddr); if (ip_addr->sa.sin_addr.s_addr != (unsigned)-1) { --- 1016,1020 ---- * formatted unsigned32 - check for validity */ ! ip_addr->sa.sin_addr.s_addr = inet_addr ((char*)netaddr); if (ip_addr->sa.sin_addr.s_addr != (unsigned)-1) { *************** *** 2263,2270 **** if ((RPC__IP_ENDPOINT_SSCANF ! ((char *) first_port_name_list[i], "%lu", &range_elements[i].low) != 1) || (RPC__IP_ENDPOINT_SSCANF ! ((char *) last_port_name_list[i], "%lu", &range_elements[i].high) != 1) || (range_elements[i].low > range_elements[i].high)) --- 2263,2270 ---- if ((RPC__IP_ENDPOINT_SSCANF ! ((char *) first_port_name_list[i], "%u", &range_elements[i].low) != 1) || (RPC__IP_ENDPOINT_SSCANF ! ((char *) last_port_name_list[i], "%u", &range_elements[i].high) != 1) || (range_elements[i].low > range_elements[i].high)) *************** *** 2388,2392 **** RPC__IP_ENDPOINT_SPRINTF ! ((char *) *port_name, "%lu", list_p -> current_port_in_range); /* --- 2388,2392 ---- RPC__IP_ENDPOINT_SPRINTF ! ((char *) *port_name, "%u", list_p -> current_port_in_range); /* Index: ipnaf_linux.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/naf/ipnaf_linux.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** ipnaf_linux.c 19 Sep 2005 20:42:52 -0000 1.3 --- ipnaf_linux.c 27 Feb 2009 16:48:55 -0000 1.4 *************** *** 646,650 **** rpc_ip_addr_t loc_ip_addr; - CODING_ERROR (status); --- 646,649 ---- *************** *** 661,665 **** RPC_SOCKET_FIX_ADDRLEN(&loc_ip_addr); ! if (getsockname (desc, (struct sockaddr *)&loc_ip_addr.sa, (int *)&loc_ip_addr.len) < 0) { *status = -1; /* !!! */ --- 660,665 ---- RPC_SOCKET_FIX_ADDRLEN(&loc_ip_addr); ! if (getsockname (desc, (struct sockaddr *)&loc_ip_addr.sa, ! &loc_ip_addr.len) < 0) { *status = -1; /* !!! */ Index: twr_uxd.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/naf/twr_uxd.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** twr_uxd.c 26 Jul 2001 18:56:14 -0000 1.1 --- twr_uxd.c 27 Feb 2009 16:48:55 -0000 1.2 *************** *** 165,169 **** related_data_size[1] = 2; ! related_data_ptr[1] = "."; /* --- 165,169 ---- related_data_size[1] = 2; ! related_data_ptr[1] = (byte_p_t)"."; /* |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:34
|
Update of /cvsroot/freedce/freedce/ncklib/rpc In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443/ncklib/rpc Modified Files: dce_error.c rpcdbg.c rpclist.c Log Message: lots of 64-bit-isms Index: dce_error.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/rpc/dce_error.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** dce_error.c 19 Sep 2005 20:42:52 -0000 1.2 --- dce_error.c 27 Feb 2009 16:48:55 -0000 1.3 *************** *** 266,271 **** } void dce_error_inq_text ( ! unsigned long status_to_convert, ! unsigned char *error_text, int *status ) --- 266,271 ---- } void dce_error_inq_text ( ! unsigned int status_to_convert, ! char *error_text, int *status ) Index: rpcdbg.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/rpc/rpcdbg.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** rpcdbg.c 28 Sep 2005 22:41:34 -0000 1.3 --- rpcdbg.c 27 Feb 2009 16:48:55 -0000 1.4 *************** *** 208,212 **** if (RPC_DBG (rpc_e_dbg_timestamp, 1)) { ! sprintf (s, "[time: %06lu] ", rpc__clock_stamp()); s = &buff[strlen(buff)]; } --- 208,212 ---- if (RPC_DBG (rpc_e_dbg_timestamp, 1)) { ! sprintf (s, "[time: %06u] ", rpc__clock_stamp()); s = &buff[strlen(buff)]; } Index: rpclist.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/rpc/rpclist.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** rpclist.c 13 Aug 2000 03:32:11 -0000 1.1.1.1 --- rpclist.c 27 Feb 2009 16:48:55 -0000 1.2 *************** *** 293,297 **** delta.tv_sec = rpc_g_lookaside_rcb.wait_time; delta.tv_nsec = 0; ! pthd4_get_expiration_np (&delta, &abstime); /* --- 293,297 ---- delta.tv_sec = rpc_g_lookaside_rcb.wait_time; delta.tv_nsec = 0; ! sys_pthread_get_expiration_np (&delta, &abstime); /* |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:32
|
Update of /cvsroot/freedce/freedce/ncklib/com In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443/ncklib/com Modified Files: Makefile.am combind.c Log Message: lots of 64-bit-isms Index: Makefile.am =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/com/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Makefile.am 26 Jul 2001 18:53:00 -0000 1.3 --- Makefile.am 27 Feb 2009 16:48:48 -0000 1.4 *************** *** 3,7 **** include $(top_srcdir)/ncklib/ncklib.mk ! CFLAGS+=-DIMAGE_DIR=\"$(libdir)\" noinst_LTLIBRARIES=libcom.la --- 3,7 ---- include $(top_srcdir)/ncklib/ncklib.mk ! AM_CFLAGS+=-DIMAGE_DIR=\"$(libdir)\" noinst_LTLIBRARIES=libcom.la Index: combind.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/com/combind.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** combind.c 13 Aug 2000 03:32:16 -0000 1.1.1.1 --- combind.c 27 Feb 2009 16:48:49 -0000 1.2 *************** *** 716,720 **** * copy other common parts of the binding rep from the source to dest */ ! dst_binding_rep->timeout = src_binding_rep->timeout; dst_binding_rep->call_timeout_time = src_binding_rep->call_timeout_time; dst_binding_rep->addr_is_dynamic = src_binding_rep->addr_is_dynamic; --- 716,720 ---- * copy other common parts of the binding rep from the source to dest */ ! dst_binding_rep->timeout = src_binding_rep->timeout; dst_binding_rep->call_timeout_time = src_binding_rep->call_timeout_time; dst_binding_rep->addr_is_dynamic = src_binding_rep->addr_is_dynamic; *************** *** 2586,2590 **** * identity. */ ! dst_binding_rep->timeout = src_binding_rep->timeout; dst_binding_rep->call_timeout_time = src_binding_rep->call_timeout_time; dst_binding_rep->addr_is_dynamic = src_binding_rep->addr_is_dynamic; --- 2586,2590 ---- * identity. */ ! dst_binding_rep->timeout = src_binding_rep->timeout; dst_binding_rep->call_timeout_time = src_binding_rep->call_timeout_time; dst_binding_rep->addr_is_dynamic = src_binding_rep->addr_is_dynamic; |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:32
|
Update of /cvsroot/freedce/freedce/ncklib/include/linux-gnu In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443/ncklib/include/linux-gnu Modified Files: sysconf.h Log Message: lots of 64-bit-isms Index: sysconf.h =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/include/linux-gnu/sysconf.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** sysconf.h 18 Jan 2005 23:23:37 -0000 1.2 --- sysconf.h 27 Feb 2009 16:48:53 -0000 1.3 *************** *** 121,126 **** #endif ! #ifndef NAF_IP ! #define NAF_IP 1 #endif --- 121,126 ---- #endif ! #ifdef NAF_IP ! #define USE_SOCKETS 1 #endif |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:30
|
Update of /cvsroot/freedce/freedce/include/dce In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443/include/dce Modified Files: ep.idl nbase.idl Log Message: lots of 64-bit-isms Index: ep.idl =================================================================== RCS file: /cvsroot/freedce/freedce/include/dce/ep.idl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** ep.idl 27 Sep 2005 21:05:36 -0000 1.5 --- ep.idl 27 Feb 2009 16:48:47 -0000 1.6 *************** *** 50,58 **** [ uuid(e1af8308-5d1f-11c9-91a4-08002b14a0fa), version(3.0), ! endpoint("ncadg_ip_udp:[136]", "ncadg_dds:[12]", "ncacn_ip_tcp:[136]"), pointer_default(ptr) ] ! /*"ncacn_dnet_nsp:[#69]", "ncalrpc:[epmapper]"),*/ interface ept { --- 50,58 ---- [ uuid(e1af8308-5d1f-11c9-91a4-08002b14a0fa), version(3.0), ! endpoint("ncadg_ip_udp:[135]", "ncacn_ip_tcp:[135]"), pointer_default(ptr) ] ! /*"ncacn_dnet_nsp:[#69]", "ncadg_dds:[12]", "ncalrpc:[epmapper]"),*/ interface ept { Index: nbase.idl =================================================================== RCS file: /cvsroot/freedce/freedce/include/dce/nbase.idl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** nbase.idl 18 Jan 2005 23:23:27 -0000 1.2 --- nbase.idl 27 Feb 2009 16:48:47 -0000 1.3 *************** *** 46,54 **** typedef unsigned small unsigned8; /* positive 8 bit integer */ typedef unsigned short unsigned16; /* positive 16 bit integer */ ! typedef unsigned long unsigned32; /* positive 32 bit integer */ typedef small signed8; /* signed 8 bit integer */ typedef short signed16; /* signed 16 bit integer */ ! typedef long signed32; /* signed 32 bit integer */ /* --- 46,54 ---- typedef unsigned small unsigned8; /* positive 8 bit integer */ typedef unsigned short unsigned16; /* positive 16 bit integer */ ! typedef unsigned int unsigned32; /* positive 32 bit integer */ typedef small signed8; /* signed 8 bit integer */ typedef short signed16; /* signed 16 bit integer */ ! typedef int signed32; /* signed 32 bit integer */ /* *************** *** 60,65 **** * Canonical types for expressing procedure return status. */ ! typedef unsigned long error_status_t; ! const long error_status_ok = 0; /* --- 60,65 ---- * Canonical types for expressing procedure return status. */ ! typedef unsigned int error_status_t; ! const int error_status_ok = 0; /* |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:29
|
Update of /cvsroot/freedce/freedce/ncklib/include In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443/ncklib/include Modified Files: cnassoc.h cnp.h com.h Log Message: lots of 64-bit-isms Index: cnassoc.h =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/include/cnassoc.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** cnassoc.h 16 Feb 2005 00:12:28 -0000 1.2 --- cnassoc.h 27 Feb 2009 16:48:50 -0000 1.3 *************** *** 148,152 **** --- 148,154 ---- rpc_cn_assoc_t *rpc__cn_assoc_listen _DCE_PROTOTYPE_ (( + #ifdef USE_SOCKETS rpc_socket_t /* newsock */, + #endif unsigned_char_p_t /* endpoint */, unsigned32 * /* st */ )); Index: cnp.h =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/include/cnp.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** cnp.h 18 Jan 2005 23:23:34 -0000 1.2 --- cnp.h 27 Feb 2009 16:48:51 -0000 1.3 *************** *** 573,577 **** --- 573,582 ---- pthread_t cn_rcvr_thread_id; unsigned_char_t *cn_listening_endpoint; + #ifdef USE_SOCKETS /* experiment to only put this here if everything's using sockets*/ rpc_socket_t cn_sock; + #endif + #ifdef HAVE_OS_WIN32 /* ncacn_np handle */ + void *cn_hnd; + #endif rpc_addr_p_t rpc_addr; unsigned exit_rcvr : 1; Index: com.h =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/include/com.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** com.h 2 Oct 2005 17:14:57 -0000 1.8 --- com.h 27 Feb 2009 16:48:52 -0000 1.9 *************** *** 1025,1029 **** if (thread_context != NULL) \ { \ ! (thread_context)->cancel_timeout = rpc_c_cancel_infinite_timeout; \ (thread_context)->ns_authn_state = true; \ sys_pthread_setspecific (rpc_g_thread_context_key, \ --- 1025,1029 ---- if (thread_context != NULL) \ { \ ! (thread_context)->cancel_timeout = (signed32)rpc_c_cancel_infinite_timeout; \ (thread_context)->ns_authn_state = true; \ sys_pthread_setspecific (rpc_g_thread_context_key, \ *************** *** 1045,1049 **** if (*status == rpc_s_ok) \ { \ ! _thread_context->cancel_timeout = value; \ } \ } --- 1045,1049 ---- if (*status == rpc_s_ok) \ { \ ! _thread_context->cancel_timeout = (signed32)value; \ } \ } |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:28
|
Update of /cvsroot/freedce/freedce/idllib In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443/idllib Modified Files: Makefile.am Log Message: lots of 64-bit-isms Index: Makefile.am =================================================================== RCS file: /cvsroot/freedce/freedce/idllib/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile.am 26 Jan 2005 22:32:45 -0000 1.2 --- Makefile.am 27 Feb 2009 16:48:46 -0000 1.3 *************** *** 2,6 **** include $(top_srcdir)/include.mk ! CFLAGS+=-DMIA -I$(top_srcdir)/ncklib/include/ -I$(top_srcdir)/ncklib/include/$(target_os) --- 2,6 ---- include $(top_srcdir)/include.mk ! AM_CFLAGS+=-DMIA -I$(top_srcdir)/ncklib/include/ -I$(top_srcdir)/ncklib/include/$(target_os) |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:27
|
Update of /cvsroot/freedce/freedce In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443 Modified Files: include.mk Log Message: lots of 64-bit-isms Index: include.mk =================================================================== RCS file: /cvsroot/freedce/freedce/include.mk,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** include.mk 21 Sep 2005 16:14:54 -0000 1.7 --- include.mk 27 Feb 2009 16:48:44 -0000 1.8 *************** *** 3,7 **** dce_includes=-I$(top_srcdir)/include $(DCETHREADINCLUDES) ! CFLAGS= -g -Wall -W -O -pipe -Werror INCLUDES=$(dce_includes) --- 3,10 ---- dce_includes=-I$(top_srcdir)/include $(DCETHREADINCLUDES) ! # DRAT. DO_NOT_CLOBBER (gcc being too smart) no longer works ! #CFLAGS= -g -Wall -W -O -pipe -Werror ! AM_CFLAGS= -g -g -Wall -W -pipe ! INCLUDES=$(dce_includes) |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:24
|
Update of /cvsroot/freedce/freedce/ncklib In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443/ncklib Modified Files: ncklib.mk Log Message: lots of 64-bit-isms Index: ncklib.mk =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/ncklib.mk,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** ncklib.mk 13 Aug 2000 03:32:10 -0000 1.1.1.1 --- ncklib.mk 27 Feb 2009 16:48:48 -0000 1.2 *************** *** 1,2 **** INCLUDES+=-I$(top_srcdir)/ncklib/include -I$(top_srcdir)/ncklib/include/$(target_os) ! CFLAGS+=-DNCK -D_POSIX_C_SOURCE=1 --- 1,2 ---- INCLUDES+=-I$(top_srcdir)/ncklib/include -I$(top_srcdir)/ncklib/include/$(target_os) ! AM_CFLAGS+=-DNCK -D_POSIX_C_SOURCE=1 |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:24
|
Update of /cvsroot/freedce/freedce/dcelib In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443/dcelib Modified Files: Makefile.am dummyfuncs.c Log Message: lots of 64-bit-isms Index: Makefile.am =================================================================== RCS file: /cvsroot/freedce/freedce/dcelib/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Makefile.am 18 Jan 2005 23:23:06 -0000 1.3 --- Makefile.am 27 Feb 2009 16:48:45 -0000 1.4 *************** *** 3,7 **** include $(top_srcdir)/include.mk include $(top_srcdir)/ncklib/ncklib.mk ! CFLAGS+=-D_POSIX_C_SOURCE=1 # Build the shared library --- 3,7 ---- include $(top_srcdir)/include.mk include $(top_srcdir)/ncklib/ncklib.mk ! AM_CFLAGS+=-D_POSIX_C_SOURCE=1 # Build the shared library Index: dummyfuncs.c =================================================================== RCS file: /cvsroot/freedce/freedce/dcelib/dummyfuncs.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** dummyfuncs.c 20 Sep 2005 16:59:31 -0000 1.4 --- dummyfuncs.c 27 Feb 2009 16:48:45 -0000 1.5 *************** *** 199,203 **** RPC_DBG_PRINTF(rpc_e_dbg_general, 1, ("rpc_ns_binding_import_begin\n")); ! dump_data(10, entry_name, 16); dump_data(10, (char *)if_spec, 32); dump_data(10, (char *)object_uuid, 16); --- 199,203 ---- RPC_DBG_PRINTF(rpc_e_dbg_general, 1, ("rpc_ns_binding_import_begin\n")); ! dump_data(10, (char *)entry_name, 16); dump_data(10, (char *)if_spec, 32); dump_data(10, (char *)object_uuid, 16); |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:24
|
Update of /cvsroot/freedce/freedce/include/dce/linux-gnu In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443/include/dce/linux-gnu Modified Files: dce_error.h Log Message: lots of 64-bit-isms Index: dce_error.h =================================================================== RCS file: /cvsroot/freedce/freedce/include/dce/linux-gnu/dce_error.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** dce_error.h 16 Feb 2005 00:17:46 -0000 1.3 --- dce_error.h 27 Feb 2009 16:48:47 -0000 1.4 *************** *** 28,33 **** #define dce_c_error_string_len 160 typedef char dce_error_string_t[dce_c_error_string_len]; ! void dce_error_inq_text (unsigned long status_to_convert, ! unsigned char* error_text, int* status); #ifdef __cplusplus --- 28,33 ---- #define dce_c_error_string_len 160 typedef char dce_error_string_t[dce_c_error_string_len]; ! void dce_error_inq_text (unsigned int status_to_convert, ! char* error_text, int* status); #ifdef __cplusplus |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:22
|
Update of /cvsroot/freedce/freedce/demos/echo_server In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443/demos/echo_server Modified Files: Makefile.am echo.idl echo_client.c echo_server.c Log Message: lots of 64-bit-isms Index: Makefile.am =================================================================== RCS file: /cvsroot/freedce/freedce/demos/echo_server/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** Makefile.am 28 Sep 2005 22:41:31 -0000 1.8 --- Makefile.am 27 Feb 2009 16:48:46 -0000 1.9 *************** *** 2,6 **** include $(top_srcdir)/include.mk ! CFLAGS+=-I$(top_srcdir)/ncklib/include IDL_FLAGS=-I$(IDL_INCLUDE_DIR)/.. -I$(top_builddir)/include $(DCETHREADINCLUDES) --- 2,6 ---- include $(top_srcdir)/include.mk ! AM_CFLAGS+=-I$(top_srcdir)/ncklib/include IDL_FLAGS=-I$(IDL_INCLUDE_DIR)/.. -I$(top_builddir)/include $(DCETHREADINCLUDES) *************** *** 39,43 **** # XXX ooo, baad. major hack. _must_ write a cross-dceidl for mingw32. echo.h echo_sstub.o echo_cstub.o: echo.idl ! $(IDL) -cc_cmd "$(CC) -D_BSD $(IDL_FLAGS) $(IDL_CFLAGS) -c" \ $(IDL_INCS) \ $(top_srcdir)/demos/echo_server/echo.idl --- 39,43 ---- # XXX ooo, baad. major hack. _must_ write a cross-dceidl for mingw32. echo.h echo_sstub.o echo_cstub.o: echo.idl ! $(IDL) -I ../../include -cc_cmd "$(CC) -D_BSD $(IDL_FLAGS) $(IDL_CFLAGS) -c" \ $(IDL_INCS) \ $(top_srcdir)/demos/echo_server/echo.idl Index: echo.idl =================================================================== RCS file: /cvsroot/freedce/freedce/demos/echo_server/echo.idl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** echo.idl 18 Jan 2005 23:23:11 -0000 1.3 --- echo.idl 27 Feb 2009 16:48:46 -0000 1.4 *************** *** 5,8 **** --- 5,9 ---- ] + interface echo { Index: echo_client.c =================================================================== RCS file: /cvsroot/freedce/freedce/demos/echo_server/echo_client.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** echo_client.c 27 Sep 2005 20:28:22 -0000 1.5 --- echo_client.c 27 Feb 2009 16:48:46 -0000 1.6 *************** *** 175,179 **** printf ("got response from server. results: \n"); for (i=0; i<outargs->argc; i++) ! printf("\t[%ld]: %s\n", i, outargs->argv[i]); printf("\n===================================\n"); --- 175,179 ---- printf ("got response from server. results: \n"); for (i=0; i<outargs->argc; i++) ! printf("\t[%d]: %s\n", i, outargs->argv[i]); printf("\n===================================\n"); Index: echo_server.c =================================================================== RCS file: /cvsroot/freedce/freedce/demos/echo_server/echo_server.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** echo_server.c 29 Sep 2005 11:53:59 -0000 1.9 --- echo_server.c 27 Feb 2009 16:48:46 -0000 1.10 *************** *** 69,73 **** dce_error_inq_text(*st, estr, &tmp_st); ! fprintf(stderr, "(rpcd) %s: (0x%lx) %s\n", str, *st, estr); } --- 69,73 ---- dce_error_inq_text(*st, estr, &tmp_st); ! fprintf(stderr, "(rpcd) %s: (0x%x) %s\n", str, *st, estr); } *************** *** 287,291 **** for (i=0; i<in_text->argc; i++) ! printf("\t[arg %ld]: %s\n", i, in_text->argv[i]); printf ("\n=========================================\n"); --- 287,291 ---- for (i=0; i<in_text->argc; i++) ! printf("\t[arg %d]: %s\n", i, in_text->argv[i]); printf ("\n=========================================\n"); *************** *** 304,308 **** { result->argv[i] = ! (string_t)rpc_ss_allocate(strlen(in_text->argv[i]) + 1); } --- 304,308 ---- { result->argv[i] = ! (string_t)rpc_ss_allocate(strlen((char*)in_text->argv[i]) + 1); } *************** *** 313,317 **** for (i=0; i < in_text->argc; i++) { ! l = strlen(in_text->argv[i]); for (j=0; j<l; j++) { --- 313,317 ---- for (i=0; i < in_text->argc; i++) { ! l = strlen((char*)in_text->argv[i]); for (j=0; j<l; j++) { |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:15
|
Update of /cvsroot/freedce/freedce/ncklib/transport/dg In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443/ncklib/transport/dg Modified Files: Makefile.am dglsn.c Log Message: lots of 64-bit-isms Index: Makefile.am =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/transport/dg/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Makefile.am 26 Jul 2001 18:53:01 -0000 1.3 --- Makefile.am 27 Feb 2009 16:49:02 -0000 1.4 *************** *** 3,7 **** include $(top_srcdir)/ncklib/ncklib.mk ! CFLAGS+=-I$(IDL_INCLUDE_DIR)/.. -I$(top_builddir)/include if PROT_NCADG --- 3,7 ---- include $(top_srcdir)/ncklib/ncklib.mk ! AM_CFLAGS+=-I$(IDL_INCLUDE_DIR)/.. -I$(top_builddir)/include if PROT_NCADG Index: dglsn.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/transport/dg/dglsn.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** dglsn.c 28 Sep 2005 22:41:34 -0000 1.9 --- dglsn.c 27 Feb 2009 16:49:02 -0000 1.10 *************** *** 38,43 **** */ - #define HACK_DEBUG - #include <dg.h> #include <dgpkt.h> --- 38,41 ---- *************** *** 1580,1587 **** assert(i <= RPC_C_DG_MAX_NUM_PKTS_IN_FRAG); - #ifdef HACK_DEBUG - printf("%s: about to call RPC_SOCKET_RECVMSG\n", __FUNCTION__); - #endif - RPC_SOCKET_RECVMSG(sp->sock, iov, i, (rpc_addr_p_t)(&rqe->from), &recv_len, &serr); --- 1578,1581 ---- |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:49:14
|
Update of /cvsroot/freedce/freedce/ncklib/transport/cn In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6443/ncklib/transport/cn Modified Files: cnassoc.c cnbind.c cncall.c cncassm.c cnnet.c cnsassm.c Log Message: lots of 64-bit-isms Index: cnassoc.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/transport/cn/cnassoc.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** cnassoc.c 28 Sep 2005 22:41:34 -0000 1.7 --- cnassoc.c 27 Feb 2009 16:48:56 -0000 1.8 *************** *** 442,449 **** */ RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x negotiating presentation syntax over existing association\n", assoc->call_rep, ! assoc, ! assoc->cn_ctlblk.cn_sock)); rpc__cn_assoc_alter_context (assoc, if_r, --- 442,456 ---- */ RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "negotiating presentation syntax over existing association\n", assoc->call_rep, ! assoc ! #ifdef USE_SOCKETS ! , assoc->cn_ctlblk.cn_sock ! #endif ! )); rpc__cn_assoc_alter_context (assoc, if_r, *************** *** 463,470 **** */ RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x presentation negotiation failed st = %x\n", assoc->call_rep, assoc, assoc->cn_ctlblk.cn_sock, *st)); rpc__cn_assoc_dealloc (assoc, --- 470,483 ---- */ RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "presentation negotiation failed st = %x\n", assoc->call_rep, assoc, + #ifdef USE_SOCKETS assoc->cn_ctlblk.cn_sock, + #endif *st)); rpc__cn_assoc_dealloc (assoc, *************** *** 480,487 **** */ RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x presentation negotiation succeeded\n", assoc->call_rep, ! assoc, ! assoc->cn_ctlblk.cn_sock)); return (assoc); --- 493,507 ---- */ RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "presentation negotiation succeeded\n", assoc->call_rep, ! assoc ! #ifdef USE_SOCKETS ! , assoc->cn_ctlblk.cn_sock ! #endif ! )); return (assoc); *************** *** 567,574 **** st); RPC_DBG_PRINTF (rpc_e_dbg_cancel, RPC_C_CN_DBG_CANCEL, ! ("(rpc__cn_assoc_request) call_rep->%x assoc->%x desc->%x cancel caught before association setup\n", call_r, ! assoc, ! assoc->cn_ctlblk.cn_sock)); } ENDTRY --- 587,601 ---- st); RPC_DBG_PRINTF (rpc_e_dbg_cancel, RPC_C_CN_DBG_CANCEL, ! ("(rpc__cn_assoc_request) call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "cancel caught before association setup\n", call_r, ! assoc ! #ifdef USE_SOCKETS ! , assoc->cn_ctlblk.cn_sock ! #endif ! )); } ENDTRY *************** *** 651,658 **** assoc->call_rep = call_r; RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x establishing connection & negotiating presentation syntax\n", assoc->call_rep, ! assoc, ! assoc->cn_ctlblk.cn_sock)); rpc__cn_assoc_open (assoc, --- 678,692 ---- assoc->call_rep = call_r; RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "establishing connection & negotiating presentation syntax\n", assoc->call_rep, ! assoc ! #ifdef USE_SOCKETS ! , assoc->cn_ctlblk.cn_sock ! #endif ! )); rpc__cn_assoc_open (assoc, *************** *** 690,697 **** */ RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x presentation negotiation succeeded\n", assoc->call_rep, ! assoc, ! assoc->cn_ctlblk.cn_sock)); rpc__cn_assoc_alloc (assoc, st); --- 724,738 ---- */ RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "presentation negotiation succeeded\n", assoc->call_rep, ! assoc ! #ifdef USE_SOCKETS ! , assoc->cn_ctlblk.cn_sock ! #endif ! )); rpc__cn_assoc_alloc (assoc, st); *************** *** 731,738 **** */ RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x presentation negotiation failed st = %x\n", assoc->call_rep, assoc, assoc->cn_ctlblk.cn_sock, *st)); --- 772,785 ---- */ RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "presentation negotiation failed st = %x\n", assoc->call_rep, assoc, + #ifdef USE_SOCKETS assoc->cn_ctlblk.cn_sock, + #endif *st)); *************** *** 940,950 **** --- 987,1003 ---- #ifdef _DCE_PROTO_ ( + #ifdef USE_SOCKETS rpc_socket_t newsock, + #endif unsigned_char_p_t endpoint, unsigned32 *st ) #else + #ifdef USE_SOCKETS (newsock, endpoint, st) rpc_socket_t newsock; + #else + (endpoint, st) + #endif unsigned_char_p_t endpoint; unsigned32 *st; *************** *** 973,977 **** --- 1026,1032 ---- */ assoc->cn_ctlblk.cn_state = RPC_C_CN_OPEN; + #ifdef USE_SOCKETS assoc->cn_ctlblk.cn_sock = newsock; + #endif assoc->cn_ctlblk.cn_listening_endpoint = endpoint; *************** *** 1685,1692 **** { RPC_DBG_PRINTF (rpc_e_dbg_cancel, RPC_C_CN_DBG_CANCEL, ! ("(rpc__cn_assoc_receive_frag) call_rep->%x assoc->%x desc->%x cancel caught\n", assoc->call_rep, ! assoc, ! assoc->cn_ctlblk.cn_sock)); rpc__cn_call_local_cancel (call_rep, &retry_op, --- 1740,1754 ---- { RPC_DBG_PRINTF (rpc_e_dbg_cancel, RPC_C_CN_DBG_CANCEL, ! ("(rpc__cn_assoc_receive_frag) call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "cancel caught\n", assoc->call_rep, ! assoc ! #ifdef USE_SOCKETS ! ,assoc->cn_ctlblk.cn_sock ! #endif ! )); rpc__cn_call_local_cancel (call_rep, &retry_op, *************** *** 1798,1802 **** --- 1860,1866 ---- rpc_socket_iovec_t *iovp; rpc_socket_iovec_t out_iov; + #ifdef USE_SOCKETS static rpc_addr_p_t addr = NULL; + #endif unsigned32 bytes_to_send; boolean32 free_iov_buffer; *************** *** 1913,1916 **** --- 1977,1981 ---- sys_pthread_testcancel(); #endif + #ifdef USE_SOCKETS RPC_SOCKET_SENDMSG (assoc->cn_ctlblk.cn_sock, iovp, *************** *** 1919,1922 **** --- 1984,1991 ---- &cc, &serr); + #endif + #ifdef HAVE_OS_WIN32 + #error need to put something here!!! + #endif #ifdef NON_CANCELLABLE_IO *************** *** 1985,1992 **** RPC_DBG_PRINTF (rpc_e_dbg_cancel, RPC_C_CN_DBG_CANCEL, ! ("(rpc__cn_assoc_send_frag) call_rep->%x assoc->%x desc->%x cancel caught\n", assoc->call_rep, ! assoc, ! assoc->cn_ctlblk.cn_sock)); } --- 2054,2068 ---- RPC_DBG_PRINTF (rpc_e_dbg_cancel, RPC_C_CN_DBG_CANCEL, ! ("(rpc__cn_assoc_send_frag) call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "cancel caught\n", assoc->call_rep, ! assoc ! #ifdef USE_SOCKETS ! , assoc->cn_ctlblk.cn_sock ! #endif ! )); } *************** *** 2033,2040 **** { RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_ERRORS, ! ("(rpc__cn_assoc_send_frag) call_rep->%x assoc->%x desc->%x SENDMSG failed, error=%d\n", assoc->call_rep, assoc, assoc->cn_ctlblk.cn_sock, RPC_SOCKET_ETOI(serr))); /* --- 2109,2122 ---- { RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_ERRORS, ! ("(rpc__cn_assoc_send_frag) call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "SENDMSG failed, error=%d\n", assoc->call_rep, assoc, + #ifdef USE_SOCKETS assoc->cn_ctlblk.cn_sock, + #endif RPC_SOCKET_ETOI(serr))); /* *************** *** 2056,2063 **** RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x sent %d bytes\n", assoc->call_rep, assoc, assoc->cn_ctlblk.cn_sock, cc)); bytes_to_send -= cc; --- 2138,2151 ---- RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "sent %d bytes\n", assoc->call_rep, assoc, + #ifdef USE_SOCKETS assoc->cn_ctlblk.cn_sock, + #endif cc)); bytes_to_send -= cc; *************** *** 2313,2320 **** { RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x presentation negotiation failed - abstract syntax not registered - st = %x\n", assoc->call_rep, assoc, assoc->cn_ctlblk.cn_sock, *st)); --- 2401,2414 ---- { RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "presentation negotiation failed - abstract syntax not registered - st = %x\n", assoc->call_rep, assoc, + #ifdef USE_SOCKETS assoc->cn_ctlblk.cn_sock, + #endif *st)); *************** *** 2355,2362 **** { RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x presentation syntax negotiated\n", assoc->call_rep, ! assoc, ! assoc->cn_ctlblk.cn_sock)); /* --- 2449,2463 ---- { RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "presentation syntax negotiated\n", assoc->call_rep, ! assoc ! #ifdef USE_SOCKETS ! , assoc->cn_ctlblk.cn_sock ! #endif ! )); /* *************** *** 2404,2411 **** { RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x presentation negotiation failed - no matching transfer syntax\n", assoc->call_rep, ! assoc, ! assoc->cn_ctlblk.cn_sock)); /* --- 2505,2519 ---- { RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "presentation negotiation failed - no matching transfer syntax\n", assoc->call_rep, ! assoc ! #ifdef USE_SOCKETS ! , assoc->cn_ctlblk.cn_sock ! #endif ! )); /* *************** *** 2514,2521 **** } RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_ERRORS, ! ("CN: call_rep->%x assoc->%x desc->%x presentation context for context id given not found context_id->%x\n", assoc->call_rep, assoc, assoc->cn_ctlblk.cn_sock, context_id)); *st = rpc_s_context_id_not_found; --- 2622,2635 ---- } RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_ERRORS, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "presentation context for context id given not found context_id->%x\n", assoc->call_rep, assoc, + #ifdef USE_SOCKETS assoc->cn_ctlblk.cn_sock, + #endif context_id)); *st = rpc_s_context_id_not_found; *************** *** 2607,2614 **** } RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_ERRORS, ! ("CN: call_rep->%x assoc->%x desc->%x presentation context for call id given not found call_id->%x\n", assoc->call_rep, assoc, assoc->cn_ctlblk.cn_sock, call_id)); *st = rpc_s_call_id_not_found; --- 2721,2734 ---- } RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_ERRORS, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "presentation context for call id given not found call_id->%x\n", assoc->call_rep, assoc, + #ifdef USE_SOCKETS assoc->cn_ctlblk.cn_sock, + #endif call_id)); *st = rpc_s_call_id_not_found; *************** *** 2702,2709 **** } RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_SECURITY_ERRORS, ! ("CN: call_rep->%x assoc->%x desc->%x no matching security context element for key id key_id->%x\n", assoc->call_rep, assoc, assoc->cn_ctlblk.cn_sock, key_id)); *sec = NULL; --- 2822,2835 ---- } RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_SECURITY_ERRORS, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "no matching security context element for key id key_id->%x\n", assoc->call_rep, assoc, + #ifdef USE_SOCKETS assoc->cn_ctlblk.cn_sock, + #endif key_id)); *sec = NULL; Index: cnbind.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/transport/cn/cnbind.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** cnbind.c 13 Aug 2000 03:32:13 -0000 1.1.1.1 --- cnbind.c 27 Feb 2009 16:48:57 -0000 1.2 *************** *** 124,128 **** if (!is_server) { ! ((rpc_cn_binding_rep_t *)brp)->being_resolved = false; RPC_CN_UNLOCK (); } --- 124,128 ---- if (!is_server) { ! brp->being_resolved = false; RPC_CN_UNLOCK (); } *************** *** 474,478 **** --- 474,480 ---- rpc_cn_local_id_t grp_id; rpc_cn_assoc_grp_t *assoc_grp; + #ifdef USE_SOCKETS rpc_protseq_id_t protseq_id; + #endif CODING_ERROR (st); *************** *** 527,530 **** --- 529,534 ---- * association group. */ + #ifdef USE_SOCKETS + rpc__naf_desc_inq_protseq_id (((rpc_cn_assoc_t *)assoc_grp->grp_assoc_list.next)->cn_ctlblk.cn_sock, *************** *** 546,549 **** --- 550,556 ---- } } + #else + *st = rpc_s_cant_inq_socket; + #endif } binding_r->rpc_addr = *rpc_addr; Index: cncall.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/transport/cn/cncall.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** cncall.c 28 Sep 2005 22:41:34 -0000 1.4 --- cncall.c 27 Feb 2009 16:48:57 -0000 1.5 *************** *** 2929,2933 **** else { ! if ((unsigned)delta.tv_sec == rpc_c_cancel_infinite_timeout) { ; /* we never timeout */ --- 2929,2933 ---- else { ! if ((unsigned long)delta.tv_sec == (unsigned long)rpc_c_cancel_infinite_timeout) { ; /* we never timeout */ Index: cncassm.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/transport/cn/cncassm.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** cncassm.c 28 Sep 2005 22:41:34 -0000 1.3 --- cncassm.c 27 Feb 2009 16:48:58 -0000 1.4 *************** *** 1713,1720 **** RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x connection request initiated to %s[%s]\n", assoc->call_rep, assoc, assoc->cn_ctlblk.cn_sock, netaddr, endpoint)); --- 1713,1726 ---- RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "connection request initiated to %s[%s]\n", assoc->call_rep, assoc, + #ifdef USE_SOCKETS assoc->cn_ctlblk.cn_sock, + #endif netaddr, endpoint)); *************** *** 1746,1753 **** event.event_id = RPC_C_ASSOC_REQUEST_CONN_ACK; RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x connection established\n", assoc->call_rep, ! assoc, ! assoc->cn_ctlblk.cn_sock)); break; } --- 1752,1766 ---- event.event_id = RPC_C_ASSOC_REQUEST_CONN_ACK; RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "connection established\n", assoc->call_rep, ! assoc ! #ifdef USE_SOCKETS ! , assoc->cn_ctlblk.cn_sock ! #endif ! )); break; } *************** *** 1764,1771 **** */ RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x connection request failed st = %x\n", assoc->call_rep, assoc, assoc->cn_ctlblk.cn_sock, assoc->assoc_status)); --- 1777,1790 ---- */ RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "connection request failed st = %x\n", assoc->call_rep, assoc, + #ifdef USE_SOCKETS assoc->cn_ctlblk.cn_sock, + #endif assoc->assoc_status)); *************** *** 3364,3371 **** { RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_SECURITY_ERRORS, ! ("CN: call_rep->%x assoc->%x desc->%x server verifcation failed security_context->%x auth_type->%x auth_level->%x auth_len->%x st->%x\n", assoc->call_rep, assoc, assoc->cn_ctlblk.cn_sock, sec_context, auth_tlr->auth_type, --- 3383,3396 ---- { RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_SECURITY_ERRORS, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "server verifcation failed security_context->%x auth_type->%x auth_level->%x auth_len->%x st->%x\n", assoc->call_rep, assoc, + #ifdef USE_SOCKETS assoc->cn_ctlblk.cn_sock, + #endif sec_context, auth_tlr->auth_type, *************** *** 4823,4830 **** &st); RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x negotiating for abstract syntax->%s,%x context_id->%x call_id->%x\n", assoc->call_rep, assoc, assoc->cn_ctlblk.cn_sock, abstract, pres_context->syntax_abstract_id.version, --- 4848,4861 ---- &st); RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "negotiating for abstract syntax->%s,%x context_id->%x call_id->%x\n", assoc->call_rep, assoc, + #ifdef USE_SOCKETS assoc->cn_ctlblk.cn_sock, + #endif abstract, pres_context->syntax_abstract_id.version, *************** *** 4852,4859 **** &st); RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x desc->%x transfer_syntax[%x]->%s,%x\n", assoc->call_rep, assoc, assoc->cn_ctlblk.cn_sock, i, transfer, --- 4883,4896 ---- &st); RPC_DBG_PRINTF (rpc_e_dbg_general, RPC_C_CN_DBG_GENERAL, ! ("CN: call_rep->%x assoc->%x " ! #ifdef USE_SOCKETS ! "desc->%x " ! #endif ! "transfer_syntax[%x]->%s,%x\n", assoc->call_rep, assoc, + #ifdef USE_SOCKETS assoc->cn_ctlblk.cn_sock, + #endif i, transfer, Index: cnnet.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/transport/cn/cnnet.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** cnnet.c 2 Oct 2005 17:14:57 -0000 1.3 --- cnnet.c 27 Feb 2009 16:48:59 -0000 1.4 *************** *** 50,53 **** --- 50,55 ---- #include <cnnet.h> + #ifdef USE_SOCKETS + /***********************************************************************/ /* *************** *** 2078,2079 **** --- 2080,2082 ---- *st = rpc_s_ok; } + #endif Index: cnsassm.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/transport/cn/cnsassm.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** cnsassm.c 28 Sep 2005 22:41:34 -0000 1.4 --- cnsassm.c 27 Feb 2009 16:49:00 -0000 1.5 *************** *** 4479,4483 **** return rpc_s_class_version_mismatch; ! pipe_name = (char *)(((unsigned)req_header) + RPC_CN_PKT_SIZEOF_INHERIT_CTX_HDR); host_name = (char *)(pipe_name + strlen(pipe_name) + 1); vuser_info = (void *)(host_name + strlen(host_name) + 1); --- 4479,4483 ---- return rpc_s_class_version_mismatch; ! pipe_name = (char *)(((unsigned long)req_header) + RPC_CN_PKT_SIZEOF_INHERIT_CTX_HDR); host_name = (char *)(pipe_name + strlen(pipe_name) + 1); vuser_info = (void *)(host_name + strlen(host_name) + 1); *************** *** 4497,4502 **** * just store it? nuts to it - just store it. */ ! vuser_info = (void*)(((unsigned)vuser_info)+sizeof(unsigned32)); ! npsec->Length = pkt_len - ((unsigned)vuser_info - (unsigned)req_header); RPC_MEM_ALLOC(npsec->blob, void *, --- 4497,4502 ---- * just store it? nuts to it - just store it. */ ! vuser_info = (void*)(((unsigned long)vuser_info)+sizeof(unsigned32)); ! npsec->Length = pkt_len - ((unsigned long)vuser_info - (unsigned long)req_header); RPC_MEM_ALLOC(npsec->blob, void *, |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:46:56
|
Update of /cvsroot/freedce/freedce/ncklib/transport/cn In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4277/ncklib/transport/cn Modified Files: cninit.c Log Message: two stupid errors. 1) missing init function for list data structures 2) swapped PROTSEQ_NCACN_NP with PROTSEQ_NCACN no wonder things were pear-shaped Index: cninit.c =================================================================== RCS file: /cvsroot/freedce/freedce/ncklib/transport/cn/cninit.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** cninit.c 22 Nov 2005 18:23:13 -0000 1.6 --- cninit.c 27 Feb 2009 16:46:35 -0000 1.7 *************** *** 305,309 **** rpc__ncacn_sockbased_init, /* BSD Socket-based Connection-RPC */ NULL, ! RPC_C_PROTOCOL_ID_NCACN_NP, NULL, NULL, NULL, NULL , NULL } --- 305,309 ---- rpc__ncacn_sockbased_init, /* BSD Socket-based Connection-RPC */ NULL, ! RPC_C_PROTOCOL_ID_NCACN, NULL, NULL, NULL, NULL , NULL } *************** *** 312,320 **** rpc__ncacn_namedpipe_init, /* NamedPipes Connection-RPC */ NULL, ! RPC_C_PROTOCOL_ID_NCACN, NULL, NULL, NULL, NULL , NULL } #endif }; #ifdef HAVE_OS_WIN32 rpc__register_protocol_id(prot, 2); --- 312,323 ---- rpc__ncacn_namedpipe_init, /* NamedPipes Connection-RPC */ NULL, ! RPC_C_PROTOCOL_ID_NCACN_NP, NULL, NULL, NULL, NULL , NULL } #endif }; + + rpc__ncacn_common_init (); + #ifdef HAVE_OS_WIN32 rpc__register_protocol_id(prot, 2); |
|
From: Luke K. C. L. <lk...@us...> - 2009-02-27 16:45:36
|
Update of /cvsroot/freedce/freedce/rpcd In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2616 Modified Files: Makefile.am dsm.c dsm.h dsm.idl dsm_p.h rpcd.c rpcdep.c rpcdutil.c Log Message: 64-bit errors in header of dsm data, expanded header from 16 to 24 bytes, pointer is 8 bytes and then 4 more bytes padding Index: Makefile.am =================================================================== RCS file: /cvsroot/freedce/freedce/rpcd/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** Makefile.am 28 Sep 2005 22:41:34 -0000 1.10 --- Makefile.am 27 Feb 2009 16:45:15 -0000 1.11 *************** *** 4,8 **** C_FLAGS=-DNCK -D_POSIX_SOURCE=1 -I$(top_srcdir)/ncklib/include -I$(top_srcdir)/ncklib/include/$(target_os) ! CFLAGS+=$(C_FLAGS) CXXFLAGS+=$(C_FLAGS) --- 4,8 ---- C_FLAGS=-DNCK -D_POSIX_SOURCE=1 -I$(top_srcdir)/ncklib/include -I$(top_srcdir)/ncklib/include/$(target_os) ! AM_CFLAGS+=$(C_FLAGS) CXXFLAGS+=$(C_FLAGS) Index: dsm.c =================================================================== RCS file: /cvsroot/freedce/freedce/rpcd/dsm.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** dsm.c 27 Sep 2005 22:48:05 -0000 1.5 --- dsm.c 27 Feb 2009 16:45:17 -0000 1.6 *************** *** 62,66 **** ** preheader and the data portion of the record are both aligned to an 8-byte ** boundary. The first 64 bytes of each record, including the preheader, ! ** fit within a page, so the preheader (16 bytes currently) and the first ** 48 bytes of the user data can be atomically updated. ** --- 62,66 ---- ** preheader and the data portion of the record are both aligned to an 8-byte ** boundary. The first 64 bytes of each record, including the preheader, ! ** fit within a page, so the preheader (20 bytes currently) and the first ** 48 bytes of the user data can be atomically updated. ** *************** *** 88,91 **** --- 88,93 ---- */ + #define DSM_DEBUG + #include <dce/dce.h> #include <string.h> *************** *** 131,134 **** --- 133,138 ---- file_hdr_t fhdr; /* file header (first page) */ + memset(&fhdr, 0, sizeof(fhdr)); + CLEANUP { /* upon errors */ if (fd != -1) close(fd); /* if file is open close it */ *************** *** 458,462 **** dsm_handle dsh = (dsm_handle)dsx; block_t *p; /* the actual record */ ! unsigned long sp,ep; /* base of start page, end page */ CLEANUP { /* upon errors */ --- 462,466 ---- dsm_handle dsh = (dsm_handle)dsx; block_t *p; /* the actual record */ ! unsigned int sp,ep; /* base of start page, end page */ CLEANUP { /* upon errors */ *************** *** 1000,1004 **** verify_dsh(dsh); /* reality check */ ! printf("DSM map; %d initialized pages of %d bytes; %d allocations pending\n", dsh->pages, PAGE_SIZE, dsh->pending); --- 1004,1008 ---- verify_dsh(dsh); /* reality check */ ! printf("DSM map; %d initialized pages of %ld bytes; %d allocations pending\n", dsh->pages, PAGE_SIZE, dsh->pending); *************** *** 1009,1013 **** for (;;) { /* until explicit break at end of chunk */ ! printf(" %08x %08x: (page %d offset %d) %d bytes ", this,this->loc,this->loc/PAGE_SIZE,MOD(this->loc,PAGE_SIZE),this->size); --- 1013,1017 ---- for (;;) { /* until explicit break at end of chunk */ ! printf(" %p %08x: (page %ld offset %ld) %d bytes ", this,this->loc,this->loc/PAGE_SIZE,MOD(this->loc,PAGE_SIZE),this->size); *************** *** 1040,1044 **** private block_t *get_free_block(dsh,min_size) dsm_handle dsh; /* data store handle */ ! unsigned long min_size; /* requested size */ { block_t *p,*pp; /* list traversers */ --- 1044,1048 ---- private block_t *get_free_block(dsh,min_size) dsm_handle dsh; /* data store handle */ ! unsigned int min_size; /* requested size */ { block_t *p,*pp; /* list traversers */ *************** *** 1072,1082 **** private block_t *grow_file(dsh, min_size, st) dsm_handle dsh; /* handle to file to grow */ ! unsigned long min_size; /* size of requested block (minimum grow amount) in bytes */ error_status_t *st; { ! unsigned long grow_pages,grow_bytes; /* number of pages, bytes to grow */ block_t *p = NULL; /* new header */ file_map_t *map = NULL; /* file map entry */ ! long flen; /* file length/offset of new chunk */ CLEANUP { --- 1076,1086 ---- private block_t *grow_file(dsh, min_size, st) dsm_handle dsh; /* handle to file to grow */ ! unsigned int min_size; /* size of requested block (minimum grow amount) in bytes */ error_status_t *st; { ! unsigned int grow_pages,grow_bytes; /* number of pages, bytes to grow */ block_t *p = NULL; /* new header */ file_map_t *map = NULL; /* file map entry */ ! int flen; /* file length/offset of new chunk */ CLEANUP { *************** *** 1094,1097 **** --- 1098,1103 ---- if (p == NULL) SIGNAL(dsm_err_no_memory); + memset(p, 0, grow_bytes); + map = NEW(file_map_t); /* get new file map entry */ if (map == NULL) SIGNAL(dsm_err_no_memory); *************** *** 1169,1173 **** dsm_handle dsh; /* data store handle */ block_t *p; /* block in question */ ! unsigned long size; /* how much to write */ error_status_t *st; { --- 1175,1179 ---- dsm_handle dsh; /* data store handle */ block_t *p; /* block in question */ ! unsigned int size; /* how much to write */ error_status_t *st; { *************** *** 1434,1439 **** file_map_t *map; /* for traversing chunk list */ block_t *next; /* next block */ ! unsigned long next_loc; /* file location of next block */ ! unsigned long offset; /* offset within a chunk */ next_loc = this->loc+PREHEADER+this->size; /* where next block is in the file */ --- 1440,1445 ---- file_map_t *map; /* for traversing chunk list */ block_t *next; /* next block */ ! unsigned int next_loc; /* file location of next block */ ! unsigned int offset; /* offset within a chunk */ next_loc = this->loc+PREHEADER+this->size; /* where next block is in the file */ *************** *** 1559,1563 **** if (dsh->cache.loc == mkr) return dsh->cache.p; /* in the cache? */ else if (!dsh->coalesced && dsh->map != NULL && dsh->map->link == NULL) { ! long offset; offset = mkr - dsh->map->loc; /* bytes into chunk */ --- 1565,1569 ---- if (dsh->cache.loc == mkr) return dsh->cache.p; /* in the cache? */ else if (!dsh->coalesced && dsh->map != NULL && dsh->map->link == NULL) { ! int offset; offset = mkr - dsh->map->loc; /* bytes into chunk */ Index: dsm.h =================================================================== RCS file: /cvsroot/freedce/freedce/rpcd/dsm.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** dsm.h 13 Aug 2000 03:32:25 -0000 1.1.1.1 --- dsm.h 27 Feb 2009 16:45:18 -0000 1.2 *************** *** 1,3 **** ! /* Generated by IDL compiler version OSF DCE T1.1.0-03 with GNU Flex/Bison */ #ifndef dsm_v0_0_included #define dsm_v0_0_included --- 1,3 ---- ! /* Generated by IDL compiler version FreeDCE 1.1.0.7 with GNU Flex/Bison */ #ifndef dsm_v0_0_included #define dsm_v0_0_included *************** *** 13,30 **** #include <dce/nbase.h> #endif ! #define dsm_mod (470482944) ! #define dsm_err_create_failed (470482945) ! #define dsm_err_file_io_error (470482946) ! #define dsm_err_open_failed (470482947) ! #define dsm_err_version (470482948) ! #define dsm_err_no_memory (470482949) ! #define dsm_err_duplicate_write (470482950) ! #define dsm_err_header_too_long (470482951) ! #define dsm_err_no_more_entries (470482952) ! #define dsm_err_invalid_handle (470482953) ! #define dsm_err_invalid_pointer (470482954) ! #define dsm_err_info_too_long (470482955) ! #define dsm_err_file_busy (470482956) ! #define dsm_err_invalid_marker (470482957) typedef idl_void_p_t dsm_handle_t; typedef idl_ulong_int dsm_marker_t; --- 13,30 ---- #include <dce/nbase.h> #endif ! #define dsm_mod (0x1c0b0000) ! #define dsm_err_create_failed (0x1c0b0001) ! #define dsm_err_file_io_error (0x1c0b0002) ! #define dsm_err_open_failed (0x1c0b0003) ! #define dsm_err_version (0x1c0b0004) ! #define dsm_err_no_memory (0x1c0b0005) ! #define dsm_err_duplicate_write (0x1c0b0006) ! #define dsm_err_header_too_long (0x1c0b0007) ! #define dsm_err_no_more_entries (0x1c0b0008) ! #define dsm_err_invalid_handle (0x1c0b0009) ! #define dsm_err_invalid_pointer (0x1c0b000a) ! #define dsm_err_info_too_long (0x1c0b000b) ! #define dsm_err_file_busy (0x1c0b000c) ! #define dsm_err_invalid_marker (0x1c0b000d) typedef idl_void_p_t dsm_handle_t; typedef idl_ulong_int dsm_marker_t; *************** *** 34,40 **** idl_ulong_int largest_free; } dsm_stats_t; ! #define dsm_version (1) ! #define dsm_hdr_size (48) ! #define dsm_magic_marker (-268435441) extern void dsm_create( #ifdef IDL_PROTOTYPES --- 34,40 ---- idl_ulong_int largest_free; } dsm_stats_t; ! #define dsm_version (0x1) ! #define dsm_hdr_size (0x30) ! #define dsm_magic_marker (0xfffffffff000000f) extern void dsm_create( #ifdef IDL_PROTOTYPES Index: dsm.idl =================================================================== RCS file: /cvsroot/freedce/freedce/rpcd/dsm.idl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** dsm.idl 13 Aug 2000 03:32:24 -0000 1.1.1.1 --- dsm.idl 27 Feb 2009 16:45:18 -0000 1.2 *************** *** 107,125 **** */ ! const long dsm_mod = 0x1C0B0000; ! const long dsm_err_create_failed = 0x1C0B0001; ! const long dsm_err_file_io_error = 0x1C0B0002; ! const long dsm_err_open_failed = 0x1C0B0003; ! const long dsm_err_version = 0x1C0B0004; ! const long dsm_err_no_memory = 0x1C0B0005; ! const long dsm_err_duplicate_write = 0x1C0B0006; ! const long dsm_err_header_too_long = 0x1C0B0007; ! const long dsm_err_no_more_entries = 0x1C0B0008; ! const long dsm_err_invalid_handle = 0x1C0B0009; ! const long dsm_err_invalid_pointer = 0x1C0B000A; ! const long dsm_err_info_too_long = 0x1C0B000B; ! const long dsm_err_file_busy = 0x1C0B000C; ! const long dsm_err_invalid_marker = 0x1C0B000D; typedef void * dsm_handle_t; --- 107,125 ---- */ ! const unsigned32 dsm_mod = 0x1C0B0000; ! const unsigned32 dsm_err_create_failed = 0x1C0B0001; ! const unsigned32 dsm_err_file_io_error = 0x1C0B0002; ! const unsigned32 dsm_err_open_failed = 0x1C0B0003; ! const unsigned32 dsm_err_version = 0x1C0B0004; ! const unsigned32 dsm_err_no_memory = 0x1C0B0005; ! const unsigned32 dsm_err_duplicate_write = 0x1C0B0006; ! const unsigned32 dsm_err_header_too_long = 0x1C0B0007; ! const unsigned32 dsm_err_no_more_entries = 0x1C0B0008; ! const unsigned32 dsm_err_invalid_handle = 0x1C0B0009; ! const unsigned32 dsm_err_invalid_pointer = 0x1C0B000A; ! const unsigned32 dsm_err_info_too_long = 0x1C0B000B; ! const unsigned32 dsm_err_file_busy = 0x1C0B000C; ! const unsigned32 dsm_err_invalid_marker = 0x1C0B000D; typedef void * dsm_handle_t; *************** *** 132,138 **** } dsm_stats_t; ! const long dsm_version = 1; ! const long dsm_hdr_size = 48; /* amount you can write_hdr */ ! const long dsm_magic_marker = 0xF000000F; /* value of reset marker */ /** dsm_create(fname, &dsh, &st) --- 132,138 ---- } dsm_stats_t; ! const unsigned32 dsm_version = 1; ! const unsigned32 dsm_hdr_size = 48; /* amount you can write_hdr */ ! const unsigned32 dsm_magic_marker = 0xF000000F; /* value of reset marker */ /** dsm_create(fname, &dsh, &st) Index: dsm_p.h =================================================================== RCS file: /cvsroot/freedce/freedce/rpcd/dsm_p.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** dsm_p.h 22 Sep 2005 13:34:44 -0000 1.3 --- dsm_p.h 27 Feb 2009 16:45:18 -0000 1.4 *************** *** 93,97 **** #define INFOSZ 256 /* space reserved for client header info */ ! #define PREHEADER 16 /* length of preheader */ #define UNIT 64 /* 1st UNIT of each block should fit within a page */ #define USER_HDR (UNIT-PREHEADER) /* leaving this for a user header */ --- 93,97 ---- #define INFOSZ 256 /* space reserved for client header info */ ! #define PREHEADER 24 /* length of preheader */ #define UNIT 64 /* 1st UNIT of each block should fit within a page */ #define USER_HDR (UNIT-PREHEADER) /* leaving this for a user header */ *************** *** 158,168 **** naturally aligned for all potential user data (8-byte alignment), and the preheader should occupy the PREHEADER bytes just before ! the user data. It currently looks like: (16 bytes) +--------+--------+--------+--------+ \ ! | space for link ptr | | +--------+--------+--------+--------+ | | size of user data | | ! +--------+--------+--------+--------+ > preheader (16 bytes) | offset in file of preheader | | +--------+--------+--------+--------+ | --- 158,168 ---- naturally aligned for all potential user data (8-byte alignment), and the preheader should occupy the PREHEADER bytes just before ! the user data. It currently looks like: (24 bytes) +--------+--------+--------+--------+ \ ! | space for link ptr | | 4 - 8 bytes +--------+--------+--------+--------+ | | size of user data | | ! +--------+--------+--------+--------+ > preheader (24 bytes) | offset in file of preheader | | +--------+--------+--------+--------+ | *************** *** 175,190 **** typedef struct block_t { /* block preheader */ struct block_t *link; /* link to next block on (free) list [meaningless in file] */ ! unsigned long size; /* size of user data */ ! unsigned long loc; /* location (offset) of preheader in file */ boolean isfree; /* true iff free */ unsigned char cookie; /* magic number basic identification */ unsigned char unused[2]; /* preheader ends here */ double data; /* user data begins here -- double to align */ } block_t; typedef struct file_hdr_t { /* first page of file contains global info */ ! long version; /* file format version */ ! long pages; /* number of initialized data pages */ ! long pad1[20]; /* reserve for DSM header expansion */ unsigned char info[INFOSZ]; /* space for client info */ page_t padding; /* pad out past page boundary */ --- 175,191 ---- typedef struct block_t { /* block preheader */ struct block_t *link; /* link to next block on (free) list [meaningless in file] */ ! unsigned int size; /* size of user data */ ! unsigned int loc; /* location (offset) of preheader in file */ boolean isfree; /* true iff free */ unsigned char cookie; /* magic number basic identification */ unsigned char unused[2]; /* preheader ends here */ + unsigned char unused1[4]; /* 8-byte align */ double data; /* user data begins here -- double to align */ } block_t; typedef struct file_hdr_t { /* first page of file contains global info */ ! int version; /* file format version */ ! int pages; /* number of initialized data pages */ ! int pad1[20]; /* reserve for DSM header expansion */ unsigned char info[INFOSZ]; /* space for client info */ page_t padding; /* pad out past page boundary */ *************** *** 201,206 **** struct file_map_t *link; /* next in list */ block_t *ptr; /* pointer to first block in chunk */ ! unsigned long loc; /* location in file (should be on page boundary) */ ! unsigned long size; /* bytes total (should be in page multiple) */ } file_map_t; --- 202,207 ---- struct file_map_t *link; /* next in list */ block_t *ptr; /* pointer to first block in chunk */ ! unsigned int loc; /* location in file (should be on page boundary) */ ! unsigned int size; /* bytes total (should be in page multiple) */ } file_map_t; *************** *** 215,220 **** char *fname; /* pointer to malloc'd copy of filename */ file_map_t *map; /* the file map (head of list) */ ! long pages; /* initialized pages (from file header) */ ! long cookie; /* magic cookie for detecting bogus dsh's */ int pending; /* # blocks allocated but not written */ cache_t cache; /* dsm_read cache */ --- 216,221 ---- char *fname; /* pointer to malloc'd copy of filename */ file_map_t *map; /* the file map (head of list) */ ! int pages; /* initialized pages (from file header) */ ! int cookie; /* magic cookie for detecting bogus dsh's */ int pending; /* # blocks allocated but not written */ cache_t cache; /* dsm_read cache */ *************** *** 230,237 **** #ifdef _I_AM_DSM_C_ ! private block_t * get_free_block _DCE_PROTOTYPE_((dsm_handle,unsigned long)); ! private block_t * grow_file _DCE_PROTOTYPE_((dsm_handle,unsigned long, error_status_t *)); private void write_header _DCE_PROTOTYPE_((dsm_handle,block_t *, error_status_t *)); ! private void write_block _DCE_PROTOTYPE_((dsm_handle,block_t *,unsigned long, error_status_t *)); private void update_file_header _DCE_PROTOTYPE_((dsm_handle, error_status_t *)); private int create_file _DCE_PROTOTYPE_((unsigned char *)); --- 231,238 ---- #ifdef _I_AM_DSM_C_ ! private block_t * get_free_block _DCE_PROTOTYPE_((dsm_handle,unsigned int )); ! private block_t * grow_file _DCE_PROTOTYPE_((dsm_handle,unsigned int , error_status_t *)); private void write_header _DCE_PROTOTYPE_((dsm_handle,block_t *, error_status_t *)); ! private void write_block _DCE_PROTOTYPE_((dsm_handle,block_t *,unsigned int , error_status_t *)); private void update_file_header _DCE_PROTOTYPE_((dsm_handle, error_status_t *)); private int create_file _DCE_PROTOTYPE_((unsigned char *)); Index: rpcd.c =================================================================== RCS file: /cvsroot/freedce/freedce/rpcd/rpcd.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** rpcd.c 28 Sep 2005 22:41:34 -0000 1.7 --- rpcd.c 27 Feb 2009 16:45:18 -0000 1.8 *************** *** 217,221 **** dce_error_inq_text(*st, estr, &tmp_st); ! fprintf(stderr, "(rpcd) %s: (0x%lx) %s\n", str, *st, estr); } --- 217,221 ---- dce_error_inq_text(*st, estr, &tmp_st); ! fprintf(stderr, "(rpcd) %s: (0x%x) %s\n", str, *st, estr); } Index: rpcdep.c =================================================================== RCS file: /cvsroot/freedce/freedce/rpcd/rpcdep.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** rpcdep.c 22 Sep 2005 13:34:44 -0000 1.3 --- rpcdep.c 27 Feb 2009 16:45:19 -0000 1.4 *************** *** 178,182 **** for ( i=0; i < addr_count; i++ ) { ! if(strcmp(client_netaddr,local_netaddr[i]) == 0) { rpc_string_free(&client_netaddr,&status1); --- 178,182 ---- for ( i=0; i < addr_count; i++ ) { ! if(strcmp((char*)client_netaddr,local_netaddr[i]) == 0) { rpc_string_free(&client_netaddr,&status1); *************** *** 290,294 **** if (dflag) ! printf("ept_lookup entry_handle %p *entry_handle %p *num_ents %ld\n", entry_handle, *entry_handle, *num_ents); } --- 290,294 ---- if (dflag) ! printf("ept_lookup entry_handle %p *entry_handle %p *num_ents %d\n", entry_handle, *entry_handle, *num_ents); } *************** *** 334,338 **** if (dflag) ! printf("ept_map entry_handle %p *entry_handle %p *num_towers %ld\n", entry_handle, *entry_handle, *num_towers); } --- 334,338 ---- if (dflag) ! printf("ept_map entry_handle %p *entry_handle %p *num_towers %d\n", entry_handle, *entry_handle, *num_towers); } Index: rpcdutil.c =================================================================== RCS file: /cvsroot/freedce/freedce/rpcd/rpcdutil.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** rpcdutil.c 27 Sep 2005 22:48:05 -0000 1.3 --- rpcdutil.c 27 Feb 2009 16:45:20 -0000 1.4 *************** *** 68,72 **** unsigned32 i; ! fprintf(stderr, "Bad tower (%s, line %d); length=%lu\n octets=", file, line, tower->tower_length); --- 68,72 ---- unsigned32 i; ! fprintf(stderr, "Bad tower (%s, line %d); length=%u\n octets=", file, line, tower->tower_length); |
