Thank Anuj --
Attached is the patch, then. Here is a summary of changes:
Makefile: added -mt for multithreaded libraries on Solaris
screen.cpp: added needed stdarg.h for Solaris
sipp.cpp: Solaris curses doesn't define KEY_DC
sipp.cpp: Increased range for searching media port
sipp.hpp: added needed stdarg.h for Solaris
stat.hpp: Increased size of TIME_LENGTH (CStat::formatTime needs a
bigger buffer)
Thanks!
-Scott
On Thu, 2008-04-10 at 04:21, Srivastava, Anuj Kumar wrote:
> Hi Scott,
> Regarding the sipp release schedule, I am planning a release early next week.
> Regarding range of ports, if the new limit works well for you without
> problems, you can include it in your patch I suppose.
>
> Thanks
> Anuj
>
> -----Original Message-----
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Scott Oaks
> Sent: Thursday, April 10, 2008 12:54 AM
> To: Charles P Wright
> Cc: [email protected]
> Subject: Re: [Sipp-users] : New Release!
>
> Is there any sort of tentative schedule around that?
>
> I'd like to move all of our testing we do to something built around the
> latest trunk, since the advance_state field seems to have fixed the issues I
> reported earlier around the ACK messages not being sent. For our purposes, it
> makes it easier if there is an actual stable version we can point people to.
>
> But also, I am preparing a patch in order to fix some issues we have with the
> trunk code -- mostly header file differences between Solaris and other OSes
> (and so I'm assuming those won't be an issue to take).
> But one thing I'd like to include in the patch is around searching for the
> media_port -- right now, if there's a conflict, the code searches a range of
> 10 ports. We like to run many sipp processes on a big machine, so that range
> isn't big enough for us, and I'd like to propose that the range is increased
> to 100. If that's okay, I'll include it in the patch I will send along -- or
> please let me know if I should do something else.
>
> -Scott
>
> On Mon, 2008-03-31 at 16:21, Charles P Wright wrote:
> > Anuj,
> >
> > I think that a 3.1 release would be a very good idea. I have started
> > documenting the changes. I am have just committed the changes for
> > 387->398. In the coming days I will try to work my way through to the
> > most recent revision.
> >
> > Charles
> >
> > "Srivastava, Anuj Kumar" <[EMAIL PROTECTED]> wrote on
> > 03/31/2008 05:35:41 AM:
> >
> > > Hi Charles,
> > >
> > > We were planning for a new SIPP release.
> > > Do you suggest, we can have a new release now, with the latest
> > > commits, after incorporating few other useful patches ?
> > >
> > > Also, would you like to update the documentation with your changes ?
> > >
> > > Thanks
> > > Anuj
> >
> >
> > ----------------------------------------------------------------------
> > --- Check out the new SourceForge.net Marketplace.
> > It's the best place to buy or sell services for just about anything
> > Open Source.
> > http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marke
> > tplace _______________________________________________
> > Sipp-users mailing list
> > [email protected]
> > https://lists.sourceforge.net/lists/listinfo/sipp-users
>
>
> -------------------------------------------------------------------------
> This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss
> this year's exciting event. There's still time to save $100.
> Use priority code J8TL2D2.
> http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
> _______________________________________________
> Sipp-users mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/sipp-users
>
> -------------------------------------------------------------------------
> This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
> Don't miss this year's exciting event. There's still time to save $100.
> Use priority code J8TL2D2.
> http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
> _______________________________________________
> Sipp-users mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/sipp-users
diff -bru trunk/Makefile trunk.mod/Makefile
--- trunk/Makefile Fri Mar 28 10:11:33 2008
+++ trunk.mod/Makefile Thu Apr 10 10:58:33 2008
@@ -101,7 +101,7 @@
CFLAGS_linux=-D__LINUX -pthread
CFLAGS_freebsd=-D__LINUX -pthread
CFLAGS_tru64=-D__OSF1 -pthread
-CFLAGS_SunOS=-g -D__SUNOS
+CFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS
CFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
CFLAGS_Darwin=-D__DARWIN
CFLAGS=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACFLAGS)
@@ -111,7 +111,7 @@
CPPFLAGS_linux=-D__LINUX -pthread
CPPFLAGS_freebsd=-D__LINUX -pthread
CPPFLAGS_tru64=-D__OSF1 -pthread
-CPPFLAGS_SunOS=-g -D__SUNOS
+CPPFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS
CPPFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
CPPFLAGS_Darwin=-D__DARWIN
CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS)
@@ -131,7 +131,7 @@
LFLAGS_linux=
LFLAGS_freebsd=
LFLAGS_tru64=
-LFLAGS_SunOS=
+LFLAGS_SunOS=-mt ${DEBUG_FLAGS}
LFLAGS_Cygwin=
LFLAGS_Darwin=
LFLAGS=$(LFLAGS_$(SYSTEM)) $(EXTRALFLAGS)
@@ -141,7 +141,7 @@
LIBS_hpux= -lcurses -lpthread -L /opt/openssl/lib -L /usr/local/lib
LIBS_tru64= -lcurses -lpthread
LIBS_freebsd= -lcurses -pthread -L /usr/local/lib
-LIBS_SunOS= -lcurses -lpthread -lnsl -lsocket -lstdc++ -lm -ldl -L /usr/local/ssl/lib/
+LIBS_SunOS= -lcurses -lpthread -lnsl -lsocket -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm -ldl -L /usr/local/ssl/lib/
LIBS_Cygwin= -lcurses -lpthread -lstdc++ -L /usr/lib/WpdPack/Lib
LIBS_Darwin= -lcurses
LIBS=$(LIBS_$(SYSTEM)) $(EXTRALIBS)
Common subdirectories: trunk/pcap and trunk.mod/pcap
diff -bru trunk/screen.cpp trunk.mod/screen.cpp
--- trunk/screen.cpp Fri Mar 28 10:11:33 2008
+++ trunk.mod/screen.cpp Thu Apr 10 10:50:29 2008
@@ -34,6 +34,10 @@
#include <sys/time.h>
#include <sys/resource.h>
+#ifdef __SUNOS
+#include<stdarg.h>
+#endif
+
#include <unistd.h>
extern bool timeout_exit;
diff -bru trunk/sipp.cpp trunk.mod/sipp.cpp
--- trunk/sipp.cpp Wed Apr 9 13:30:59 2008
+++ trunk.mod/sipp.cpp Thu Apr 10 11:00:59 2008
@@ -1951,7 +1951,13 @@
command_buffer[0] = '\0';
command_mode = 0;
printf(SIPP_ENDL);
- } else if (c == KEY_BACKSPACE || c == KEY_DC) {
+ }
+#ifndef __SUNOS
+ else if (c == KEY_BACKSPACE || c == KEY_DC)
+#else
+ else if (c == 14)
+#endif
+ {
int command_len = strlen(command_buffer);
if (command_len > 0) {
command_buffer[command_len--] = '\0';
@@ -4935,7 +4941,7 @@
}
int try_counter;
- int max_tries = user_media_port ? 1 : 10;
+ int max_tries = user_media_port ? 1 : 100;
media_port = user_media_port ? user_media_port : DEFAULT_MEDIA_PORT;
for (try_counter = 0; try_counter < max_tries; try_counter++) {
diff -bru trunk/sipp.hpp trunk.mod/sipp.hpp
--- trunk/sipp.hpp Wed Apr 9 13:30:59 2008
+++ trunk.mod/sipp.hpp Thu Apr 10 10:50:34 2008
@@ -47,7 +47,11 @@
#include <map>
#include <set>
#include <math.h>
+#ifndef __SUNOS
#include <curses.h>
+#else
+#include <stdarg.h>
+#endif
#if defined(__HPUX) || defined(__SUNOS)
#include <alloca.h>
diff -bru trunk/stat.hpp trunk.mod/stat.hpp
--- trunk/stat.hpp Fri Mar 28 10:11:33 2008
+++ trunk.mod/stat.hpp Thu Apr 10 10:50:38 2008
@@ -25,7 +25,7 @@
#define __STAT_H__
-#define TIME_LENGTH 32
+#define TIME_LENGTH 64
#define DEFAULT_FILE_NAME (char*)"dumpFile"
#define DEFAULT_EXTENSION (char*)".csv"
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Sipp-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/sipp-users
