Menu
▾
▴
linux-atm-commits — Description of commits to our CVS repository
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
(164) |
Oct
(104) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(17) |
Jun
|
Jul
(11) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
(8) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
(1) |
Nov
|
Dec
(6) |
| 2005 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(7) |
Oct
(2) |
Nov
(6) |
Dec
|
| 2007 |
Jan
|
Feb
(3) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
(6) |
Aug
(36) |
Sep
(3) |
Oct
(1) |
Nov
|
Dec
(23) |
| 2008 |
Jan
(33) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(13) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(32) |
Sep
|
Oct
|
Nov
(14) |
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(13) |
| 2011 |
Jan
(16) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: chas w. <ch...@us...> - 2005-11-22 22:11:20
|
Update of /cvsroot/linux-atm/linux-atm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15409 Modified Files: Tag: V2_5_0 configure.in Log Message: prelimnary support for cross compiling (qgen needs built with the host compiler) Index: configure.in =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/configure.in,v retrieving revision 1.2.2.8 retrieving revision 1.2.2.9 diff -C2 -d -r1.2.2.8 -r1.2.2.9 *** configure.in 21 Apr 2005 14:29:27 -0000 1.2.2.8 --- configure.in 22 Nov 2005 22:11:05 -0000 1.2.2.9 *************** *** 26,29 **** --- 26,37 ---- AC_PROG_YACC AC_PROG_INSTALL + if test "x$cross_compiling" = "xyes"; then + AC_MSG_CHECKING(cc for build) + AC_CHECK_PROGS(CC_FOR_BUILD, gcc) + AC_MSG_RESULT($CC_FOR_BUILD) + else + CC_FOR_BUILD="${CC_FOR_BUILD-$CC}" + fi + AC_SUBST(CC_FOR_BUILD) dnl libtool defs |
|
From: chas w. <ch...@us...> - 2005-11-22 20:56:06
|
Update of /cvsroot/linux-atm/linux-atm/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30591/src/lib Modified Files: Tag: V2_5_0 Makefile.am Log Message: remove our version of stdint.h -- shouldnt need this anymore Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/lib/Makefile.am,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** Makefile.am 9 Oct 2001 22:33:07 -0000 1.2 --- Makefile.am 22 Nov 2005 20:55:55 -0000 1.2.2.1 *************** *** 14,32 **** libatm_la_DEPENDENCIES = $(top_builddir)/src/include/atm.h \ $(top_builddir)/src/include/atmsap.h \ - $(top_builddir)/src/include/stdint.h \ $(top_builddir)/src/include/atmd.h - - - #libatm_la_SOURCES = text2atm.c atm2text.c atmequal.c sdu2cell.c text2qos.c \ - # qos2text.c qosequal.c sap2text.c text2sap.c sapequal.c \ - # misc.c atmres.h ans.c - #libatm_la_LIBADD = -lresolv - #libatm_la_DEPENDENCIES = $(top_builddir)/src/include/atm.h \ - # $(top_builddir)/src/include/atmsap.h \ - # $(top_builddir)/src/include/stdint.h - # - #libatmd_la_SOURCES = common.c diag.c kptr.c text2ip.c timer.c unix.c - #libatmd_la_DEPENDENCIES = $(top_builddir)/src/include/atm.h \ - # $(top_builddir)/src/include/atmd.h \ - # $(top_builddir)/src/include/stdint.h - --- 14,16 ---- |
|
From: chas w. <ch...@us...> - 2005-11-22 20:56:03
|
Update of /cvsroot/linux-atm/linux-atm/src/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30591/src/include Modified Files: Tag: V2_5_0 Makefile.am Removed Files: Tag: V2_5_0 stdint.h Log Message: remove our version of stdint.h -- shouldnt need this anymore Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/include/Makefile.am,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** Makefile.am 9 Oct 2001 22:33:06 -0000 1.2 --- Makefile.am 22 Nov 2005 20:55:55 -0000 1.2.2.1 *************** *** 1,3 **** include_HEADERS = atm.h atmd.h atmsap.h - noinst_HEADERS = stdint.h - --- 1 ---- --- stdint.h DELETED --- |
|
From: chas w. <ch...@us...> - 2005-11-22 20:15:07
|
Update of /cvsroot/linux-atm/linux-atm/src/sigd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21664/src/sigd Modified Files: Tag: V2_5_0 sap.c Log Message: fix the sap compatability check -- see NOTE From: Martin Whitaker <mai...@ma...> Index: sap.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/sigd/sap.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** sap.c 13 Feb 2005 17:47:22 -0000 1.2.2.1 --- sap.c 22 Nov 2005 20:14:52 -0000 1.2.2.2 *************** *** 50,54 **** } - int sap_compat(const struct sockaddr_atmsvc *old_addr, const struct sockaddr_atmsvc *new_addr,struct sockaddr_atmsvc *res_addr, --- 50,53 ---- *************** *** 61,70 **** return 0; if (res_qos) *res_qos = *new_qos; ! if (old_qos->txtp.max_sdu && new_qos->rxtp.max_sdu && ! old_qos->txtp.max_sdu > new_qos->rxtp.max_sdu) return 0; ! if (new_qos->txtp.max_sdu && old_qos->rxtp.max_sdu && ! new_qos->txtp.max_sdu > old_qos->rxtp.max_sdu) return 0; ! if (!class_compat(&old_qos->txtp,&new_qos->rxtp) || ! !class_compat(&new_qos->txtp,&old_qos->rxtp)) return 0; if (!sap_equal(old_sap,new_sap, SXE_COMPATIBLE | SXE_NEGOTIATION | (res_sap ? SXE_RESULT : 0),res_sap)) --- 60,69 ---- return 0; if (res_qos) *res_qos = *new_qos; ! if (old_qos->txtp.max_sdu && new_qos->txtp.max_sdu && ! old_qos->txtp.max_sdu > new_qos->txtp.max_sdu) return 0; ! if (new_qos->rxtp.max_sdu && old_qos->rxtp.max_sdu && ! new_qos->rxtp.max_sdu > old_qos->rxtp.max_sdu) return 0; ! if (!class_compat(&old_qos->rxtp,&new_qos->rxtp) || ! !class_compat(&new_qos->txtp,&old_qos->txtp)) return 0; if (!sap_equal(old_sap,new_sap, SXE_COMPATIBLE | SXE_NEGOTIATION | (res_sap ? SXE_RESULT : 0),res_sap)) *************** *** 270,273 **** --- 269,280 ---- } + /* + * NOTE: the incoming call sap is converted to a "local view" + * in preparation for use by a local socket. Therefore, the + * forward values are assigned to atm_qos->rxtp and the + * backward values are assigned to atm_qos->txtp. This has + * implications later for sap_compat() when we compare the + * forward/backward parameters. + */ unsigned int sap_decode(Q_DSC *dsc,struct sockaddr_atmsvc *addr, |
|
From: chas w. <ch...@us...> - 2005-10-06 17:28:01
|
Update of /cvsroot/linux-atm/linux-atm/src/led In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23079 Modified Files: Tag: V2_5_0 join.c join.h kernel.c kernel.h main.c Log Message: ATM_LECSADDR support Index: join.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/led/join.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** join.c 19 Jul 2003 22:42:01 -0000 1.2.2.1 --- join.c 6 Oct 2005 17:27:50 -0000 1.2.2.2 *************** *** 132,136 **** init_conn_params(&sap, &qos, CONTROL_CONN); ! if (lecs_method == LECS_MANUAL) { diag(COMPONENT, DIAG_DEBUG, "trying manual LECS address"); conn = setup_svc(manual_atm_addr, listen_addr, &sap, &qos); --- 132,136 ---- init_conn_params(&sap, &qos, CONTROL_CONN); ! if ((lecs_method == LECS_MANUAL) || (lecs_method == LECS_FROM_ILMI)) { diag(COMPONENT, DIAG_DEBUG, "trying manual LECS address"); conn = setup_svc(manual_atm_addr, listen_addr, &sap, &qos); Index: join.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/led/join.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** join.h 9 Oct 2001 22:33:07 -0000 1.2 --- join.h 6 Oct 2005 17:27:50 -0000 1.2.2.1 *************** *** 17,20 **** --- 17,21 ---- #define LECS_WELLKNOWN 1 #define LECS_MANUAL 2 + #define LECS_FROM_ILMI 3 #endif /* JOIN_H */ Index: kernel.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/led/kernel.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** kernel.c 19 Jul 2003 22:42:01 -0000 1.2.2.1 --- kernel.c 6 Oct 2005 17:27:50 -0000 1.2.2.2 *************** *** 339,340 **** --- 339,379 ---- } } + + int get_lecsaddr(int itf, struct sockaddr_atmsvc *addr) + { + int fd, howmany; + struct atmif_sioc req; + char txt[80]; + + #ifdef ATM_GETLECSADDR + fd = socket(AF_ATMSVC, SOCK_DGRAM, 0); + if (fd < 0) { + diag(COMPONENT, DIAG_ERROR, "could not create AF_ATMSVC socket"); + return -1; + } + req.number = itf; + req.arg = addr; + req.length = sizeof( struct sockaddr_atmsvc ); + + if (ioctl(fd, ATM_GETLECSADDR, &req) < 0) { + diag(COMPONENT, DIAG_DEBUG, "ioctl ATM_GETLECSADDR failed" ); + close(fd); + return -1; + } + close(fd); + howmany = req.length; + if (howmany == 0) { + diag(COMPONENT, DIAG_ERROR, "No LECS address registered"); + return -1; + } + if (addr->sas_addr.pub[0] != 0){ + diag( COMPONENT, DIAG_ERROR, "Public address???" ); + addr->sas_addr.pub[0] = 0; + } + atm2text(txt, 80, (struct sockaddr *)addr, 0); + diag(COMPONENT, DIAG_DEBUG, "discovered LECS address %s", txt); + return howmany; + #else + return -1; + #endif + } Index: kernel.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/led/kernel.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** kernel.h 9 Oct 2001 22:33:07 -0000 1.2 --- kernel.h 6 Oct 2005 17:27:50 -0000 1.2.2.1 *************** *** 33,36 **** --- 33,37 ---- int msg_from_kernel(void); int read_from_kernel (char *buff, int size); + int get_lecsaddr(int itf, struct sockaddr_atmsvc *addr); #endif /* KERNEL_H */ Index: main.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/led/main.c,v retrieving revision 1.2.2.6 retrieving revision 1.2.2.7 diff -C2 -d -r1.2.2.6 -r1.2.2.7 *** main.c 11 Dec 2004 01:57:11 -0000 1.2.2.6 --- main.c 6 Oct 2005 17:27:50 -0000 1.2.2.7 *************** *** 205,208 **** --- 205,209 ---- char pidbuf[PATH_MAX + 1]; int fd; + int retval; memset(elan_name, '\0', sizeof(elan_name)); *************** *** 435,438 **** --- 436,455 ---- itf, foreId, max_frame_size, proxy_flag, lane_version); + if (lecs_method != LECS_MANUAL && lecs_method != LECS_NONE) { + diag(COMPONENT, DIAG_DEBUG, "trying to get LECS address from ILMI"); + /* Not sure why this memset is necessary */ + memset(&manual_atm_addr, 0, sizeof(struct sockaddr_atmsvc)); + retval = get_lecsaddr(phys_itf, &manual_atm_addr); + if (retval <= 0) { + diag(COMPONENT, DIAG_DEBUG, + "get_lecsaddr failed; not enough " + "memory allocated for all addresses " + "or no LECS address registered"); + } else { + diag(COMPONENT, DIAG_DEBUG, "obtained LECS address from ILMI"); + lecs_method = LECS_FROM_ILMI; + } + } + diag(COMPONENT, DIAG_DEBUG, "About to connect LECS"); if (lec_configure(lecs_method, &manual_atm_addr, &listen_addr) < 0) { |
|
From: chas w. <ch...@us...> - 2005-10-06 15:40:06
|
Update of /cvsroot/linux-atm/linux-atm/src/ilmid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26546 Modified Files: Tag: V2_5_0 io.c io.h wait.c Log Message: add lecs address support to ilmid Index: io.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/io.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** io.c 19 Jul 2003 21:07:19 -0000 1.2.2.1 --- io.c 6 Oct 2005 15:39:58 -0000 1.2.2.2 *************** *** 90,93 **** --- 90,125 ---- } + + void add_lecs(int itf, char *lecs) + { + int fd; + struct atmif_sioc req; + struct sockaddr_atmsvc addr; + + memset(&addr, 0, sizeof(addr)); + addr.sas_family = AF_ATMSVC; + memcpy(&addr.sas_addr.prv, lecs, 20); + + if ((fd = socket(AF_ATMSVC, SOCK_DGRAM, 0)) < 0){ + diag(COMPONENT, DIAG_ERROR, "socket: %s", strerror(errno)); + return; + } + + req.number = itf; + req.arg = &addr; + req.length = sizeof(addr); + + #ifdef ATM_ADDLECSADDR + if (ioctl(fd, ATM_ADDLECSADDR, &req) < 0) + diag(COMPONENT, DIAG_DEBUG, "ioctl ATM_ADDLECSADDR: %s", strerror(errno)); + #else + diag(COMPONENT, DIAG_DEBUG, "missing ATM_ADDLECSADDR support"); + #endif + + close(fd); + return; + } + + void update_nsap(int itf, AsnOid *netprefix, AsnOid *esi) { Index: io.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/io.h,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** io.h 19 Jul 2003 21:07:19 -0000 1.2.2.1 --- io.h 6 Oct 2005 15:39:58 -0000 1.2.2.2 *************** *** 42,45 **** --- 42,46 ---- int open_ilmi(int itf,const char *qos_spec); int get_ci_range(struct atm_cirange *ci); + void add_lecs(int itf, char *lecs); #endif Index: wait.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/Attic/wait.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** wait.c 19 Jul 2003 21:07:19 -0000 1.1.2.1 --- wait.c 6 Oct 2005 15:39:58 -0000 1.1.2.2 *************** *** 202,205 **** --- 202,207 ---- Message *wait_for_status( int fd, int itf, Msgs *msgs ){ Message *m = NULL; + VarBind *varbind; + VarBindList *vbl; m = wait_for_response( fd, itf, msgs, RESPONSE_TIMEOUT ); *************** *** 211,214 **** --- 213,229 ---- } + /* retrieve the lecs address */ + vbl = m->data->a.get_response->variable_bindings; + FOR_EACH_LIST_ELMT(varbind, vbl) { + if (AsnOidCompare(&atmfSrvcRegATMAddress, + &varbind->name) == AsnOidRoot) { + add_lecs(itf, varbind->value->a.simple->a.string->octs); + } else if (AsnOidCompare(&atmfAddressStatus, + &varbind->name) == AsnOidRoot) { + diag(COMPONENT, DIAG_ERROR, + "address already registered in switch"); + } + } + return m; } |
|
From: chas w. <ch...@us...> - 2005-09-27 23:16:43
|
Update of /cvsroot/linux-atm/linux-atm/src/qgen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23331/src/qgen Modified Files: Tag: V2_5_0 qlib.c Log Message: compiles with gcc4 now Index: qlib.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/qlib.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** qlib.c 9 Oct 2001 22:33:07 -0000 1.2 --- qlib.c 27 Sep 2005 23:16:26 -0000 1.2.2.1 *************** *** 27,31 **** ! static int debug = 0; --- 27,31 ---- ! int debug = 0; |
|
From: chas w. <ch...@us...> - 2005-09-27 23:16:43
|
Update of /cvsroot/linux-atm/linux-atm/src/switch/debug In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23331/src/switch/debug Modified Files: Tag: V2_5_0 debug.c Log Message: compiles with gcc4 now Index: debug.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/switch/debug/debug.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** debug.c 9 Oct 2001 22:33:08 -0000 1.2 --- debug.c 27 Sep 2005 23:16:26 -0000 1.2.2.1 *************** *** 44,49 **** void fab_init(CALL *call) { ! PRV(call) = alloc_t(FAB); ! PRV(call)->next = calls; calls = call; } --- 44,52 ---- void fab_init(CALL *call) { ! FAB *fab; ! ! fab = alloc_t(FAB); ! call->fab = fab; ! fab->next = calls; calls = call; } *************** *** 60,64 **** *walk = PRV(call)->next; free(PRV(call)); ! PRV(call) = NULL; } --- 63,67 ---- *walk = PRV(call)->next; free(PRV(call)); ! call->fab = NULL; } |
|
From: chas w. <ch...@us...> - 2005-09-27 23:16:42
|
Update of /cvsroot/linux-atm/linux-atm/src/sigd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23331/src/sigd Modified Files: Tag: V2_5_0 cfg_y.y Log Message: compiles with gcc4 now Index: cfg_y.y =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/sigd/cfg_y.y,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** cfg_y.y 20 Apr 2005 16:40:47 -0000 1.2.2.1 --- cfg_y.y 27 Sep 2005 23:16:26 -0000 1.2.2.2 *************** *** 11,14 **** --- 11,15 ---- #include <ctype.h> #include <limits.h> + #include <stdlib.h> #include "atm.h" |
|
From: chas w. <ch...@us...> - 2005-09-27 23:16:42
|
Update of /cvsroot/linux-atm/linux-atm/src/mpoad In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23331/src/mpoad Modified Files: Tag: V2_5_0 p_factory.c Log Message: compiles with gcc4 now Index: p_factory.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/mpoad/p_factory.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** p_factory.c 9 Oct 2001 22:33:07 -0000 1.2 --- p_factory.c 27 Sep 2005 23:16:25 -0000 1.2.2.1 *************** *** 35,39 **** while( count > 1 ) { /* This is the inner loop */ ! sum += * ((uint16_t *) addr)++; count -= 2; } --- 35,40 ---- while( count > 1 ) { /* This is the inner loop */ ! sum += * ((uint16_t *) addr); ! addr += 2; count -= 2; } |
|
From: chas w. <ch...@us...> - 2005-09-27 23:16:42
|
Update of /cvsroot/linux-atm/linux-atm/src/switch/tcp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23331/src/switch/tcp Modified Files: Tag: V2_5_0 tcpsw.c Log Message: compiles with gcc4 now Index: tcpsw.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/switch/tcp/tcpsw.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** tcpsw.c 9 Oct 2001 22:33:08 -0000 1.2 --- tcpsw.c 27 Sep 2005 23:16:26 -0000 1.2.2.1 *************** *** 346,352 **** void fab_init(CALL *call) { ! PRV(call) = alloc_t(FAB); ! PRV(call)->active = 0; ! PRV(call)->next = calls; calls = call; } --- 346,354 ---- void fab_init(CALL *call) { ! FAB *fab; ! call->fab = alloc_t(FAB); ! fab = PRV(call); ! fab->active = 0; ! fab->next = calls; calls = call; } *************** *** 363,367 **** *walk = PRV(call)->next; free(PRV(call)); ! PRV(call) = NULL; } --- 365,369 ---- *walk = PRV(call)->next; free(PRV(call)); ! call->fab = NULL; } |
|
From: chas w. <ch...@us...> - 2005-09-27 23:16:41
|
Update of /cvsroot/linux-atm/linux-atm/src/ilmid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23331/src/ilmid Modified Files: Tag: V2_5_0 atmf_uni.c Log Message: compiles with gcc4 now Index: atmf_uni.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/atmf_uni.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** atmf_uni.c 19 Jul 2003 21:07:19 -0000 1.2.2.1 --- atmf_uni.c 27 Sep 2005 23:16:24 -0000 1.2.2.2 *************** *** 229,233 **** newPrefix->name->octs = alloc(varBindName->octetLen); AsnOidCopy(newPrefix->name, varBindName); ! Q_INSERT_BEFORE((NetPrefixNode *) var->value, newPrefix, prefix); if(atmNetPrefix.octs == NULL) { --- 229,236 ---- newPrefix->name->octs = alloc(varBindName->octetLen); AsnOidCopy(newPrefix->name, varBindName); ! { ! NetPrefixNode *tmp = (NetPrefixNode *) var->value; ! Q_INSERT_BEFORE(tmp, newPrefix, prefix); ! } if(atmNetPrefix.octs == NULL) { *************** *** 239,243 **** else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual) { ! Q_REMOVE((NetPrefixNode *) var->value, prefix); } --- 242,249 ---- else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual) { ! { ! NetPrefixNode *tmp = (NetPrefixNode *) var->value; ! Q_REMOVE(tmp, prefix); ! } } |
|
From: chas w. <ch...@us...> - 2005-09-27 23:16:40
|
Update of /cvsroot/linux-atm/linux-atm/src/maint In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23331/src/maint Modified Files: Tag: V2_5_0 atmtcp.c Log Message: compiles with gcc4 now Index: atmtcp.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/maint/atmtcp.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** atmtcp.c 9 Oct 2001 22:33:07 -0000 1.2 --- atmtcp.c 27 Sep 2005 23:16:25 -0000 1.2.2.1 *************** *** 61,65 **** static fd_set in_set; static int fds = 0; ! static int debug = 0; static int links = 0; --- 61,65 ---- static fd_set in_set; static int fds = 0; ! int debug = 0; static int links = 0; |
|
From: chas w. <ch...@us...> - 2005-04-21 14:29:46
|
Update of /cvsroot/linux-atm/linux-atm/src/oamd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8223/src/oamd Modified Files: Tag: V2_5_0 Makefile.am Log Message: make oamd build conditionally Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/oamd/Attic/Makefile.am,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Makefile.am 21 Feb 2004 15:31:40 -0000 1.1.2.1 --- Makefile.am 21 Apr 2005 14:29:28 -0000 1.1.2.2 *************** *** 1,3 **** ! sbin_PROGRAMS = atmoamd atmoamd_SOURCES = atmoamd.c io.c io.h oam.c oam.h crc10.c crc10.h --- 1,5 ---- ! sbin_PROGRAMS = @atmoamd@ ! ! EXTRA_PROGRAMS = atmoamd atmoamd_SOURCES = atmoamd.c io.c io.h oam.c oam.h crc10.c crc10.h |
|
From: chas w. <ch...@us...> - 2005-04-21 14:29:46
|
Update of /cvsroot/linux-atm/linux-atm/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8223/src Modified Files: Tag: V2_5_0 Makefile.am Log Message: make oamd build conditionally Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/Makefile.am,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** Makefile.am 19 Jul 2003 22:03:27 -0000 1.2.2.1 --- Makefile.am 21 Apr 2005 14:29:28 -0000 1.2.2.2 *************** *** 1,3 **** SUBDIRS = include lib test debug qgen saal sigd maint arpd ilmid man led lane \ ! mpoad switch config extra br2684 --- 1,3 ---- SUBDIRS = include lib test debug qgen saal sigd maint arpd ilmid man led lane \ ! mpoad oamd switch config extra br2684 |
|
From: chas w. <ch...@us...> - 2005-04-21 14:29:36
|
Update of /cvsroot/linux-atm/linux-atm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8223 Modified Files: Tag: V2_5_0 configure.in Log Message: make oamd build conditionally Index: configure.in =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/configure.in,v retrieving revision 1.2.2.7 retrieving revision 1.2.2.8 diff -C2 -d -r1.2.2.7 -r1.2.2.8 *** configure.in 13 Feb 2005 17:47:22 -0000 1.2.2.7 --- configure.in 21 Apr 2005 14:29:27 -0000 1.2.2.8 *************** *** 180,183 **** --- 180,197 ---- ]) + atmoamd="" + AC_SUBST(atmoamd) + AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT + #include <sys/ioctl.h> + #include <linux/atmoam.h> + ], + [[ int fd; + + ioctl(kernel, ATMOAMD_CTRL, 0); + ]])], + [atmoamd="atmoamd"], + [AC_MSG_WARN([*** atmoamd will not be built. Missing kernel support?])], + [AC_MSG_WARN([*** atmoamd will not be built. Can't test when cross-compiling.])]) + dnl Xsed="sed -e s/^X//" dnl LTLIBOBJS=`echo X"$LIBOBJS" | \$Xsed -e "s,\. [^.]* ,.lo,g;s,\.[^.]*$,.lo,"` |
|
From: chas w. <ch...@us...> - 2005-04-20 18:12:21
|
Update of /cvsroot/linux-atm/linux-atm/src/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24474 Modified Files: Tag: V2_5_0 Makefile.am Added Files: Tag: V2_5_0 pmp_send.c Log Message: point to multipoint example --- NEW FILE: pmp_send.c --- #include <stdlib.h> #include <stdio.h> #include <unistd.h> #include <string.h> #include <errno.h> #include <sys/types.h> #include <sys/socket.h> #include <sys/time.h> #include <sys/ioctl.h> #include <atm.h> #include <linux/atmdev.h> #define BHLI_MAGIC "FORE_ATM" #define NUMPDUS 50000 static void usage(const char *name) { fprintf(stderr, "usage: %s <nsap> [<nsap> [...]]\n", name); exit(1); } int main(int argc, char **argv) { struct sockaddr_atmsvc addr, leaf; struct atm_qos qos; struct atm_sap sap; int s, i, ep_ref, errcount = 0, leaves = 0; int one = 1; char *outbuf = (char *) malloc(8192); if (outbuf == NULL) return 1; if (argc < 2) { fprintf(stderr, "not enough arguments\n"); usage(argv[0]); } if ((s = socket(PF_ATMSVC, SOCK_DGRAM, 0)) < 0) { perror("socket"); return 1; } memset(&addr, 0, sizeof(addr)); if (text2atm(argv[1], (struct sockaddr *) &addr, sizeof(addr), T2A_SVC) < 0) usage(argv[0]); memset(&qos, 0, sizeof(qos)); qos.aal = ATM_AAL5; qos.txtp.traffic_class = ATM_UBR; qos.rxtp.traffic_class = ATM_NONE; qos.txtp.max_sdu = 8192; memset(&sap, 0, sizeof(sap)); sap.bhli.hl_type = ATM_HL_USER; sap.bhli.hl_length = 8; memcpy(&sap.bhli.hl_info, BHLI_MAGIC, 8); if (setsockopt(s, SOL_ATM, SO_ATMQOS, &qos, sizeof(qos)) < 0) { perror("setsockopt SO_ATMQOS (1)"); return 1; } if (setsockopt(s, SOL_ATM, SO_ATMSAP, &sap, sizeof(sap)) < 0) { perror("setsockopt SO_ATMSAP"); return 1; } if (setsockopt(s, SOL_ATM, SO_MULTIPOINT, &one, sizeof(one)) < 0) { perror("setsockopt SO_MULTIPOINT"); return 1; } if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { /* return here if connect fails. The ADDPARTY ioctl can't * be called until connect succeeds. */ perror("connect"); return 1; } fprintf(stderr, "added leaf 0 at %s\n", argv[1]); leaves = 1; if (argc > 2) for (i = 2; i < argc; i++) { if (text2atm(argv[i], (struct sockaddr *) &leaf, sizeof(leaf), T2A_SVC) >= 0) { if ((ep_ref = ioctl(s, ATM_ADDPARTY, &leaf)) < 0) perror("ATM_ADDPARTY"); else { fprintf(stderr, "added leaf %d at %s\n", ep_ref, argv[i]); leaves++; } } else fprintf(stderr, "invalid leaf address\n"); } fprintf(stderr, "sending %d PDUs\n", NUMPDUS); for (i = 0, errcount = 0; i < NUMPDUS; i++) if (write(s, outbuf, 8192) < 0) errcount++; write(s, NULL, 0); if (errcount > 0) fprintf(stderr, "write() failed %d out of %d times\n", errcount, NUMPDUS); ep_ref = leaves - 1; while (ep_ref >= 0) { i = ioctl(s, ATM_DROPPARTY, &ep_ref); if (i < 0) perror("ioctl(ATM_DROPPARTY)"); else fprintf(stderr, "dropped leaf %d\n", ep_ref); ep_ref--; } if (close(s) < 0) perror("close s"); exit(0); } Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/test/Makefile.am,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** Makefile.am 26 Sep 2004 12:07:06 -0000 1.2.2.3 --- Makefile.am 20 Apr 2005 18:12:12 -0000 1.2.2.4 *************** *** 1,3 **** ! USRPGMS = aread awrite ttcp_atm atmswitch svc_recv svc_send PGMS = align aping br bw isp window bin_PROGRAMS = $(USRPGMS) --- 1,4 ---- ! USRPGMS = aread awrite ttcp_atm atmswitch svc_recv svc_send @pmp_send@ ! EXTRA_PROGRAMS = pmp_send PGMS = align aping br bw isp window bin_PROGRAMS = $(USRPGMS) *************** *** 12,15 **** --- 13,17 ---- svc_send_SOURCES = svc_send.c ttcp_atm_SOURCES = ttcp.c + pmp_send_SOURCES = pmp_send.c align_SOURCES = align.c |
|
From: chas w. <ch...@us...> - 2005-04-20 17:14:04
|
Update of /cvsroot/linux-atm/linux-atm/src/qgen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24269 Modified Files: Tag: V2_5_0 qlib.h Log Message: extern q_dump dependent on DUMP_MODE Index: qlib.h =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/qgen/qlib.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** qlib.h 9 Oct 2001 22:33:07 -0000 1.2 --- qlib.h 20 Apr 2005 17:13:56 -0000 1.2.2.1 *************** *** 24,28 **** --- 24,30 ---- + #ifndef DUMP_MODE extern int q_dump; + #endif extern void q_report(int severity,const char *msg,...); |
|
From: chas w. <ch...@us...> - 2005-04-20 17:05:57
|
Update of /cvsroot/linux-atm/linux-atm/src/ilmid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17987 Modified Files: Tag: V2_5_0 Makefile.am Log Message: ilmid.8 and ilmid.h not included in tarball (from Arvin Schnell <ar...@su...>) Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/ilmid/Makefile.am,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** Makefile.am 19 Jul 2003 21:07:19 -0000 1.2.2.2 --- Makefile.am 20 Apr 2005 17:05:47 -0000 1.2.2.3 *************** *** 8,12 **** util.c util.h io.c io.h message.c message.h \ atmf_uni.c atmf_uni.h mib.c mib.h \ ! sysgroup.c sysgroup.h ilmid.c \ wait.c wait.h states.c states.h actions.c actions.h ilmid_LDADD = $(top_builddir)/src/lib/libatm.la \ --- 8,12 ---- util.c util.h io.c io.h message.c message.h \ atmf_uni.c atmf_uni.h mib.c mib.h \ ! sysgroup.c sysgroup.h ilmid.c ilmid.h \ wait.c wait.h states.c states.h actions.c actions.h ilmid_LDADD = $(top_builddir)/src/lib/libatm.la \ *************** *** 16,19 **** man_MANS = ilmid.8 ! EXTRA_DIST = COPYRIGHT --- 16,19 ---- man_MANS = ilmid.8 ! EXTRA_DIST = COPYRIGHT ilmid.8 |
|
From: chas w. <ch...@us...> - 2005-04-20 16:55:11
|
Update of /cvsroot/linux-atm/linux-atm/src/br2684 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10977/br2684 Modified Files: Tag: V2_5_0 Makefile.am Log Message: its all in the man page now Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/br2684/Attic/Makefile.am,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Makefile.am 19 Jul 2003 22:03:28 -0000 1.1.2.1 --- Makefile.am 20 Apr 2005 16:55:03 -0000 1.1.2.2 *************** *** 7,10 **** man_MANS = br2684ctl.8 ! EXTRA_DIST = $(man_MANS) USAGE.br2684 --- 7,10 ---- man_MANS = br2684ctl.8 ! EXTRA_DIST = $(man_MANS) |
|
From: chas w. <ch...@us...> - 2005-04-20 16:41:00
|
Update of /cvsroot/linux-atm/linux-atm/src/sigd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3458/sigd Modified Files: Tag: V2_5_0 cfg_y.y Log Message: From: Arvin Schnell <ar...@su...> Re: [Linux-ATM-General] patch for correct usage of yacc/bison Index: cfg_y.y =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/sigd/cfg_y.y,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** cfg_y.y 9 Oct 2001 22:33:07 -0000 1.2 --- cfg_y.y 20 Apr 2005 16:40:47 -0000 1.2.2.1 *************** *** 170,174 **** T2A_SVC | T2A_WILDCARD | T2A_NAME | T2A_LOCAL) < 0) { yyerror("invalid address"); ! return; } add_route(curr_sig,&addr,mask ? strtol(mask,NULL,10) : INT_MAX); --- 170,174 ---- T2A_SVC | T2A_WILDCARD | T2A_NAME | T2A_LOCAL) < 0) { yyerror("invalid address"); ! YYABORT; } add_route(curr_sig,&addr,mask ? strtol(mask,NULL,10) : INT_MAX); |
|
From: chas w. <ch...@us...> - 2005-04-20 16:41:00
|
Update of /cvsroot/linux-atm/linux-atm/src/switch In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3458/switch Modified Files: Tag: V2_5_0 cfg_y.y Log Message: From: Arvin Schnell <ar...@su...> Re: [Linux-ATM-General] patch for correct usage of yacc/bison Index: cfg_y.y =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/switch/cfg_y.y,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** cfg_y.y 9 Oct 2001 22:33:08 -0000 1.2 --- cfg_y.y 20 Apr 2005 16:40:47 -0000 1.2.2.1 *************** *** 119,123 **** T2A_SVC | T2A_WILDCARD | T2A_NAME | T2A_LOCAL) < 0) { yyerror("invalid address"); ! return; } put_route(&addr,mask ? strtol(mask,NULL,10) : INT_MAX,sig); --- 119,123 ---- T2A_SVC | T2A_WILDCARD | T2A_NAME | T2A_LOCAL) < 0) { yyerror("invalid address"); ! YYABORT; } put_route(&addr,mask ? strtol(mask,NULL,10) : INT_MAX,sig); |
|
From: chas w. <ch...@us...> - 2005-04-18 16:19:27
|
Update of /cvsroot/linux-atm/linux-atm/src/debug In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2461/src/debug Modified Files: Tag: V2_5_0 svctor.c Log Message: add missing header file Index: svctor.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/debug/svctor.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** svctor.c 9 Oct 2001 22:33:06 -0000 1.2 --- svctor.c 18 Apr 2005 16:19:16 -0000 1.2.2.1 *************** *** 22,25 **** --- 22,26 ---- #include <stdio.h> #include <unistd.h> + #include <stdlib.h> #include <fcntl.h> #include <signal.h> |
|
From: chas w. <ch...@us...> - 2005-04-18 16:18:39
|
Update of /cvsroot/linux-atm/linux-atm/src/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1597 Modified Files: Tag: V2_5_0 ttcp.c Log Message: quiet compiler warnings Index: ttcp.c =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/src/test/ttcp.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** ttcp.c 9 Oct 2001 22:33:08 -0000 1.2 --- ttcp.c 18 Apr 2005 16:18:28 -0000 1.2.2.1 *************** *** 56,62 **** --- 56,69 ---- #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> + #include <string.h> + #include <getopt.h> #include <signal.h> #include <ctype.h> #include <errno.h> + #include <stdlib.h> + #include <unistd.h> + #include <string.h> #include <sys/types.h> #include <sys/socket.h> *************** *** 121,127 **** struct hostent *addr; - extern int errno; - extern int optind; - extern char *optarg; char Usage[] = "\ --- 128,131 ---- *************** *** 159,180 **** double cput, realt; /* user, real time (seconds) */ ! void err(); ! void mes(); ! int pattern(); ! void prep_timer(); ! double read_timer(); ! int Nread(); ! int Nwrite(); ! void delay(); ! int mread(); ! char *outfmt(); ! static void prusage(); ! static void tvadd(); ! static void tvsub(); ! static void psecs(); void ! sigpipe() { } --- 163,185 ---- double cput, realt; /* user, real time (seconds) */ ! void err(const char *); ! void mes(const char *); ! void pattern(char *, int); ! void prep_timer(void); ! double read_timer(char *, int); ! int Nread(int, char *, int); ! int Nwrite(int, char *, int); ! void delay(long); ! int mread(int, char *, unsigned); ! char *outfmt(double); ! static void prusage(struct rusage *, struct rusage *, struct timeval *, struct timeval *, char *); ! static void tvadd(struct timeval *, struct timeval *, struct timeval *); ! static void tvsub(struct timeval *, struct timeval *, struct timeval *); ! static void psecs(long, char*); void ! sigpipe(int sig) { + return; } *************** *** 184,190 **** *------------------------------------------------------------------------- */ ! main(argc,argv) ! int argc; ! char **argv; { struct timeval td; --- 189,194 ---- *------------------------------------------------------------------------- */ ! int ! main(int argc, char **argv) { struct timeval td; *************** *** 276,282 **** } ! if (port_name) ! if (atm) goto usage; ! else { struct servent *se; --- 280,287 ---- } ! if (port_name) { ! if (atm) { ! goto usage; ! } else { struct servent *se; *************** *** 284,288 **** if (se) port = ntohs(se->s_port); else { ! const char *end; port = strtoul(port_name,&end,0); --- 289,293 ---- if (se) port = ntohs(se->s_port); else { ! char *end; port = strtoul(port_name,&end,0); *************** *** 290,293 **** --- 295,299 ---- } } + } host = argv[optind]; *************** *** 407,440 **** } #endif - /* set socket buffer size */ - #if defined(SO_SNDBUF) || defined(SO_RCVBUF) - if (sockbufsize) { - int len; - - if (trans) { - /* set send socket buffer if we are transmitting */ - if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sockbufsize, - sizeof sockbufsize) < 0) - err("setsockopt: sndbuf"); - len = sizeof sockbufsize; - if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sockbufsize, &len) < 0) - perror("getsockopt: sndbuf"); - mes("sndbuf"); - } else { - /* set receive socket buffer if we are receiving */ - if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sockbufsize, - sizeof sockbufsize) < 0) - err("setsockopt: rcvbuf"); - len = sizeof sockbufsize; - if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sockbufsize, &len) < 0) - perror("getsockopt: rcvbuf"); - mes("rcvbuf"); - } - printf("real buffer size = %d\n",sockbufsize); - } - #endif if (!atm || satm.sas_family == AF_ATMPVC || !trans) ! if (bind(fd, atm ? &satm : &sinme, atm ? satm.sas_family == AF_ATMPVC ? sizeof(struct sockaddr_atmpvc) : sizeof(struct sockaddr_atmsvc) : sizeof(sinme)) < 0) --- 413,419 ---- } #endif if (!atm || satm.sas_family == AF_ATMPVC || !trans) ! if (bind(fd, atm ? (struct sockaddr *) &satm : (struct sockaddr *) &sinme, atm ? satm.sas_family == AF_ATMPVC ? sizeof(struct sockaddr_atmpvc) : sizeof(struct sockaddr_atmsvc) : sizeof(sinme)) < 0) *************** *** 454,458 **** } ! if (connect(fd, atm ? &satm : &sinhim, atm ? sizeof(satm) : sizeof(sinhim)) < 0) err("connect"); --- 433,437 ---- } ! if (connect(fd, atm ? (struct sockaddr *) &satm : (struct sockaddr *) &sinhim, atm ? sizeof(satm) : sizeof(sinhim)) < 0) err("connect"); *************** *** 483,487 **** domain = AF_INET; ! if ((fd=accept(fd, &frominet, &fromlen) ) < 0) err("accept"); --- 462,466 ---- domain = AF_INET; ! if ((fd=accept(fd, (struct sockaddr *) &frominet, &fromlen) ) < 0) err("accept"); *************** *** 489,493 **** struct sockaddr_atmsvc peer; int peerlen = sizeof(peer); ! if (getpeername(fd, (struct sockaddr_in *) &peer, &peerlen) < 0) { err("getpeername"); --- 468,472 ---- struct sockaddr_atmsvc peer; int peerlen = sizeof(peer); ! if (getpeername(fd, (struct sockaddr *) &peer, &peerlen) < 0) { err("getpeername"); *************** *** 497,501 **** if (atm2text(name,MAX_ATM_ADDR_LEN+1,(struct sockaddr *) ! &peer,A2T_NAME | A2T_PRETTY) < 0) strcpy(name,"<invalid>"); fprintf(stderr,"ttcp-r: accept from %s\n",name); --- 476,480 ---- if (atm2text(name,MAX_ATM_ADDR_LEN+1,(struct sockaddr *) ! &peer,/* A2T_NAME | */ A2T_PRETTY) < 0) strcpy(name,"<invalid>"); fprintf(stderr,"ttcp-r: accept from %s\n",name); *************** *** 516,519 **** --- 495,527 ---- } } + + /* set socket buffer size */ + #if defined(SO_SNDBUF) || defined(SO_RCVBUF) + if (sockbufsize) { + int len; + + if (trans) { + /* set send socket buffer if we are transmitting */ + if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sockbufsize, + sizeof sockbufsize) < 0) + err("setsockopt: sndbuf"); + len = sizeof sockbufsize; + if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &sockbufsize, &len) < 0) + perror("getsockopt: sndbuf"); + mes("sndbuf"); + } else { + /* set receive socket buffer if we are receiving */ + if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sockbufsize, + sizeof sockbufsize) < 0) + err("setsockopt: rcvbuf"); + len = sizeof sockbufsize; + if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &sockbufsize, &len) < 0) + perror("getsockopt: rcvbuf"); + mes("rcvbuf"); + } + printf("real buffer size = %d\n",sockbufsize); + } + #endif + if (tos) { unsigned char tos_value; *************** *** 614,618 **** (void)Nwrite(fd, buf, 4); /* rcvr end */ } ! if (cput <= 0.0) cput = 0.001; --- 622,626 ---- (void)Nwrite(fd, buf, 4); /* rcvr end */ } ! if (cput <= 0.0) cput = 0.001; *************** *** 639,643 **** fprintf(stdout, ! "ttcp%s: %d I/O calls, msec/call = %.2f, calls/sec = %.2f\n", trans?"-t":"-r", numCalls, --- 647,651 ---- fprintf(stdout, ! "ttcp%s: %ld I/O calls, msec/call = %.2f, calls/sec = %.2f\n", trans?"-t":"-r", numCalls, *************** *** 645,652 **** ((double)numCalls)/realt); fprintf(stdout, ! "ttcp%s: buffer address %#x\n", trans?"-t":"-r", ! buf); } exit(0); --- 653,664 ---- ((double)numCalls)/realt); fprintf(stdout, ! "ttcp%s: buffer address %#lx\n", trans?"-t":"-r", ! (unsigned long )buf); } + + if (udp && trans) + sleep(1); + exit(0); *************** *** 657,662 **** void ! err(s) ! char *s; { int en = errno; --- 669,673 ---- void ! err(const char *s) { int en = errno; *************** *** 671,676 **** void ! mes(s) ! char *s; { fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", s); --- 682,686 ---- void ! mes(const char *s) { fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", s); *************** *** 682,685 **** --- 692,696 ---- *------------------------------------------------------------------------- */ + void pattern(cp, cnt) register char *cp; *************** *** 759,763 **** */ void ! prep_timer() { gettimeofday(&start_time, (struct timezone *)0); --- 770,774 ---- */ void ! prep_timer(void) { gettimeofday(&start_time, (struct timezone *)0); *************** *** 771,774 **** --- 782,786 ---- double read_timer(str,len) char *str; + int len; { struct rusage ru1; *************** *** 814,818 **** cp = "%Uuser %Ssys %Ereal %P %Mmaxrss %F+%Rpf %Ccsw"; #else ! cp = "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw"; #endif #endif --- 826,830 ---- cp = "%Uuser %Ssys %Ereal %P %Mmaxrss %F+%Rpf %Ccsw"; #else ! cp = (char *) "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw"; #endif #endif *************** *** 824,828 **** case 'U': tvsub(&tdiff, &r1->ru_utime, &r0->ru_utime); ! sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000); END(outp); break; --- 836,840 ---- case 'U': tvsub(&tdiff, &r1->ru_utime, &r0->ru_utime); ! sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000); END(outp); break; *************** *** 830,834 **** case 'S': tvsub(&tdiff, &r1->ru_stime, &r0->ru_stime); ! sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000); END(outp); break; --- 842,846 ---- case 'S': tvsub(&tdiff, &r1->ru_stime, &r0->ru_stime); ! sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000); END(outp); break; *************** *** 852,861 **** case 'X': ! sprintf(outp,"%d", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t); END(outp); break; case 'D': ! sprintf(outp,"%d", t == 0 ? 0 : (r1->ru_idrss+r1->ru_isrss-(r0->ru_idrss+r0->ru_isrss))/t); END(outp); --- 864,873 ---- case 'X': ! sprintf(outp,"%ld", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t); END(outp); break; case 'D': ! sprintf(outp,"%ld", t == 0 ? 0 : (r1->ru_idrss+r1->ru_isrss-(r0->ru_idrss+r0->ru_isrss))/t); END(outp); *************** *** 863,867 **** case 'K': ! sprintf(outp,"%d", t == 0 ? 0 : ((r1->ru_ixrss+r1->ru_isrss+r1->ru_idrss) - (r0->ru_ixrss+r0->ru_idrss+r0->ru_isrss))/t); --- 875,879 ---- case 'K': ! sprintf(outp,"%ld", t == 0 ? 0 : ((r1->ru_ixrss+r1->ru_isrss+r1->ru_idrss) - (r0->ru_ixrss+r0->ru_idrss+r0->ru_isrss))/t); *************** *** 870,898 **** case 'M': ! sprintf(outp,"%d", r1->ru_maxrss/2); END(outp); break; case 'F': ! sprintf(outp,"%d", r1->ru_majflt-r0->ru_majflt); END(outp); break; case 'R': ! sprintf(outp,"%d", r1->ru_minflt-r0->ru_minflt); END(outp); break; case 'I': ! sprintf(outp,"%d", r1->ru_inblock-r0->ru_inblock); END(outp); break; case 'O': ! sprintf(outp,"%d", r1->ru_oublock-r0->ru_oublock); END(outp); break; case 'C': ! sprintf(outp,"%d+%d", r1->ru_nvcsw-r0->ru_nvcsw, r1->ru_nivcsw-r0->ru_nivcsw ); END(outp); --- 882,910 ---- case 'M': ! sprintf(outp,"%ld", r1->ru_maxrss/2); END(outp); break; case 'F': ! sprintf(outp,"%ld", r1->ru_majflt-r0->ru_majflt); END(outp); break; case 'R': ! sprintf(outp,"%ld", r1->ru_minflt-r0->ru_minflt); END(outp); break; case 'I': ! sprintf(outp,"%ld", r1->ru_inblock-r0->ru_inblock); END(outp); break; case 'O': ! sprintf(outp,"%ld", r1->ru_oublock-r0->ru_oublock); END(outp); break; case 'C': ! sprintf(outp,"%ld+%ld", r1->ru_nvcsw-r0->ru_nvcsw, r1->ru_nivcsw-r0->ru_nivcsw ); END(outp); *************** *** 959,987 **** * N R E A D */ ! Nread( fd, buf, count ) ! int fd; ! char *buf; int count; { struct sockaddr_in from; int len = sizeof(from); register int cnt; if( udp ) { #if 0 ! cnt = recvfrom( fd, buf, count, 0, &from, &len ); #else ! cnt = recv( fd, buf, count, 0); #endif numCalls++; } else { if( b_flag ) ! cnt = mread( fd, buf, count ); /* fill buf */ else { ! cnt = read( fd, buf, count ); numCalls++; } if (touchdata && cnt > 0) { register int c = cnt, sum; ! register char *b = buf; while (c--) sum += *b++; --- 971,1002 ---- * N R E A D */ ! int ! Nread(_fd, _buf, count) ! int _fd; ! char *_buf; int count; { + #if 0 struct sockaddr_in from; int len = sizeof(from); + #endif register int cnt; if( udp ) { #if 0 ! cnt = recvfrom(_fd, _buf, count, 0, &from, &len ); #else ! cnt = recv(_fd, _buf, count, 0); #endif numCalls++; } else { if( b_flag ) ! cnt = mread( _fd, _buf, count ); /* fill buf */ else { ! cnt = read( _fd, _buf, count ); numCalls++; } if (touchdata && cnt > 0) { register int c = cnt, sum; ! register char *b = _buf; while (c--) sum += *b++; *************** *** 995,1001 **** *------------------------------------------------------------------------- */ ! Nwrite(fd, buf, count) ! int fd; ! char *buf; int count; { --- 1010,1017 ---- *------------------------------------------------------------------------- */ ! int ! Nwrite(_fd, _buf, count) ! int _fd; ! char *_buf; int count; { *************** *** 1004,1009 **** if (udp) { again: ! if (atm) cnt = write(fd, buf, count); ! else cnt = sendto(fd, buf, count, 0, &sinhim, sizeof(sinhim)); numCalls++; if ( cnt<0 && errno == ENOBUFS ) { --- 1020,1025 ---- if (udp) { again: ! if (atm) cnt = write(_fd, _buf, count); ! else cnt = sendto(_fd, _buf, count, 0, (struct sockaddr *) &sinhim, sizeof(sinhim)); numCalls++; if ( cnt<0 && errno == ENOBUFS ) { *************** *** 1013,1017 **** } } else { ! cnt = write(fd, buf, count); numCalls++; } --- 1029,1033 ---- } } else { ! cnt = write(_fd, _buf, count); numCalls++; } *************** *** 1021,1025 **** void ! delay(us) { struct timeval tv; --- 1037,1041 ---- void ! delay(long us) { struct timeval tv; *************** *** 1027,1031 **** tv.tv_sec = 0; tv.tv_usec = us; ! (void)select( 1, (char *)0, (char *)0, (char *)0, &tv ); } --- 1043,1047 ---- tv.tv_sec = 0; tv.tv_usec = us; ! (void)select( 1, (void *)0, (void *)0, (void *)0, &tv ); } *************** *** 1040,1045 **** */ int ! mread(fd, bufp, n) ! int fd; register char *bufp; unsigned n; --- 1056,1061 ---- */ int ! mread(_fd, bufp, n) ! int _fd; register char *bufp; unsigned n; *************** *** 1049,1053 **** do { ! nread = read(fd, bufp, n-count); numCalls++; if(nread < 0) { --- 1065,1069 ---- do { ! nread = read(_fd, bufp, n-count); numCalls++; if(nread < 0) { |
|
From: chas w. <ch...@us...> - 2005-04-18 15:51:23
|
Update of /cvsroot/linux-atm/linux-atm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20094 Modified Files: Tag: V2_5_0 ChangeLog Log Message: updated for jay's fix Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/ChangeLog,v retrieving revision 1.2.2.5 retrieving revision 1.2.2.6 diff -C2 -d -r1.2.2.5 -r1.2.2.6 *** ChangeLog 13 Feb 2005 17:47:18 -0000 1.2.2.5 --- ChangeLog 18 Apr 2005 15:51:15 -0000 1.2.2.6 *************** *** 7,10 **** --- 7,11 ---- - building outside the source tree should now work properly - TimeTicks (in ilmid) should be unsigned + - fix zeppelin's handling of LE_ARP REMOTE_ADDRESS flag New features |
1 message has been excluded from this view by a project administrator.
