Menu
▾
▴
sipp-commits
|
From: <cha...@us...> - 2008-07-21 14:21:01
|
Revision: 511
http://sipp.svn.sourceforge.net/sipp/?rev=511&view=rev
Author: charlespwright
Date: 2008-07-21 14:20:57 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
revised pollset_process fix by M.H. Van Leeuwen.
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-07-18 11:09:18 UTC (rev 510)
+++ sipp/trunk/sipp.cpp 2008-07-21 14:20:57 UTC (rev 511)
@@ -29,6 +29,7 @@
* Clement Chen
* Wolfgang Beck
* Charles P Wright from IBM Research
+ * Martin Van Leeuwen
*/
#define GLOBALS_FULL_DEFINITION
@@ -3180,14 +3181,16 @@
}
} else {
if ((ret = empty_socket(sock)) <= 0) {
- read_error(sock, ret);
- /* If read_error() then the poll_idx now belongs
- * to the newest/last socket added to the sockets[].
- * Need to re-do the same poll_idx for the "new" socket. */
- poll_idx--;
- events++;
- rs--;
- continue;
+ ret = read_error(sock, ret);
+ if (ret == 0) {
+ /* If read_error() then the poll_idx now belongs
+ * to the newest/last socket added to the sockets[].
+ * Need to re-do the same poll_idx for the "new" socket. */
+ poll_idx--;
+ events++;
+ rs--;
+ continue;
+ }
}
}
events++;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-07-21 14:22:23
|
Revision: 512
http://sipp.svn.sourceforge.net/sipp/?rev=512&view=rev
Author: charlespwright
Date: 2008-07-21 14:22:19 +0000 (Mon, 21 Jul 2008)
Log Message:
-----------
Remove erroneous assert by M.H. Van Leeuwen.
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-07-21 14:20:57 UTC (rev 511)
+++ sipp/trunk/sipp.cpp 2008-07-21 14:22:19 UTC (rev 512)
@@ -2475,7 +2475,9 @@
#endif
/* We have only non-blocking reads, so this should not occur. */
- assert(errno != EAGAIN);
+ if (ret < 0) {
+ assert(errno != EAGAIN);
+ }
if (socket->ss_transport == T_TCP || socket->ss_transport == T_TLS) {
if (ret == 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-07-23 17:13:03
|
Revision: 516
http://sipp.svn.sourceforge.net/sipp/?rev=516&view=rev
Author: charlespwright
Date: 2008-07-23 17:13:00 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
Fix: Third party mode checks must go before creationMode check when creating new incoming calls.
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-07-22 19:06:05 UTC (rev 515)
+++ sipp/trunk/sipp.cpp 2008-07-23 17:13:00 UTC (rev 516)
@@ -2994,22 +2994,7 @@
if(!listener_ptr)
{
- if(creationMode == MODE_SERVER)
- {
- if (quitting >= 1) {
- CStat::globalStat(CStat::E_OUT_OF_CALL_MSGS);
- TRACE_MSG("Discarded message for new calls while quitting\n");
- return;
- }
-
- // Adding a new INCOMING call !
- main_scenario->stats->computeStat(CStat::E_CREATE_INCOMING_CALL);
- listener_ptr = new call(call_id, socket, src);
- if (!listener_ptr) {
- ERROR("Out of memory allocating a call!");
- }
- }
- else if(thirdPartyMode == MODE_3PCC_CONTROLLER_B || thirdPartyMode == MODE_3PCC_A_PASSIVE
+ if(thirdPartyMode == MODE_3PCC_CONTROLLER_B || thirdPartyMode == MODE_3PCC_A_PASSIVE
|| thirdPartyMode == MODE_MASTER_PASSIVE || thirdPartyMode == MODE_SLAVE)
{
// Adding a new OUTGOING call !
@@ -3045,6 +3030,21 @@
}
listener_ptr = new_ptr;
}
+ else if(creationMode == MODE_SERVER)
+ {
+ if (quitting >= 1) {
+ CStat::globalStat(CStat::E_OUT_OF_CALL_MSGS);
+ TRACE_MSG("Discarded message for new calls while quitting\n");
+ return;
+ }
+
+ // Adding a new INCOMING call !
+ main_scenario->stats->computeStat(CStat::E_CREATE_INCOMING_CALL);
+ listener_ptr = new call(call_id, socket, src);
+ if (!listener_ptr) {
+ ERROR("Out of memory allocating a call!");
+ }
+ }
else // mode != from SERVER and 3PCC Controller B
{
// This is a message that is not relating to any known call
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-07-28 01:27:08
|
Revision: 522
http://sipp.svn.sourceforge.net/sipp/?rev=522&view=rev
Author: charlespwright
Date: 2008-07-28 01:27:05 +0000 (Mon, 28 Jul 2008)
Log Message:
-----------
Don't get try to output count files if it is not intialized.
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-07-25 19:45:05 UTC (rev 521)
+++ sipp/trunk/sipp.cpp 2008-07-28 01:27:05 UTC (rev 522)
@@ -1060,12 +1060,16 @@
void print_count_file(FILE *f, int header) {
char temp_str[256];
+ if (!main_scenario || (!header && !main_scenario->stats)) {
+ return;
+ }
+
if (header) {
fprintf(f, "CurrentTime%sElapsedTime%s", stat_delimiter, stat_delimiter);
} else {
struct timeval currentTime, startTime;
GET_TIME(¤tTime);
- display_scenario->stats->getStartTime(&startTime);
+ main_scenario->stats->getStartTime(&startTime);
unsigned long globalElapsedTime = CStat::computeDiffTimeInMs (¤tTime, &startTime);
fprintf(f, "%s%s", CStat::formatTime(¤tTime), stat_delimiter);
fprintf(f, "%s%s", CStat::msToHHMMSSmmm(globalElapsedTime), stat_delimiter);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-09-22 14:47:02
|
Revision: 533
http://sipp.svn.sourceforge.net/sipp/?rev=533&view=rev
Author: charlespwright
Date: 2008-09-22 14:46:56 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
Fix: If we are in server mode, we should also allow TCP reconnections.
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-08-28 22:06:11 UTC (rev 532)
+++ sipp/trunk/sipp.cpp 2008-09-22 14:46:56 UTC (rev 533)
@@ -4802,10 +4802,6 @@
opentask::set_rate(rate);
}
- if (creationMode == MODE_SERVER) {
- reset_number = 0;
- }
-
open_connections();
/* Defaults for media sockets */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-09-22 15:12:09
|
Revision: 535
http://sipp.svn.sourceforge.net/sipp/?rev=535&view=rev
Author: charlespwright
Date: 2008-09-22 15:12:06 +0000 (Mon, 22 Sep 2008)
Log Message:
-----------
Enh: Allow log files to be used in scenario initialization. (From Andy Aicken).
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-09-22 14:48:05 UTC (rev 534)
+++ sipp/trunk/sipp.cpp 2008-09-22 15:12:06 UTC (rev 535)
@@ -30,6 +30,7 @@
* Wolfgang Beck
* Charles P Wright from IBM Research
* Martin Van Leeuwen
+ * Andy Aicken
*/
#define GLOBALS_FULL_DEFINITION
@@ -4407,9 +4408,12 @@
REQUIRE_ARG();
CHECK_PASS();
if (!strcmp(argv[argi - 1], "-sf")) {
- main_scenario = new scenario(argv[argi], 0);
scenario_file = new char [strlen(argv[argi])+1] ;
sprintf(scenario_file,"%s", argv[argi]);
+ if (useLogf == 1) {
+ rotate_logfile();
+ }
+ main_scenario = new scenario(argv[argi], 0);
main_scenario->stats->setFileName(argv[argi], (char*)".csv");
} else if (!strcmp(argv[argi - 1], "-sn")) {
int i = find_scenario(argv[argi]);
@@ -4677,10 +4681,6 @@
print_count_file(countf, 1);
}
- if (useLogf == 1) {
- rotate_logfile();
- }
-
if (dumpInRtt == 1) {
main_scenario->stats->initRtt((char*)scenario_file, (char*)".csv",
report_freq_dumpRtt);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-09-29 15:34:07
|
Revision: 545
http://sipp.svn.sourceforge.net/sipp/?rev=545&view=rev
Author: charlespwright
Date: 2008-09-29 15:33:30 +0000 (Mon, 29 Sep 2008)
Log Message:
-----------
Fix: Decrement pending_messages when a socket is invalidated (provided by Martin H. VanLeeuwen.
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-09-26 12:22:47 UTC (rev 544)
+++ sipp/trunk/sipp.cpp 2008-09-29 15:33:30 UTC (rev 545)
@@ -2925,6 +2925,12 @@
pollfiles[pollidx] = pollfiles[pollnfds];
sockets[pollidx] = sockets[pollnfds];
sockets[pollidx]->ss_pollidx = pollidx;
+ sockets[pollnfds] = NULL;
+
+ if (socket->ss_msglen)
+ {
+ pending_messages--;
+ }
}
void sipp_close_socket (struct sipp_socket *socket) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-09-26 03:03:07
|
Revision: 543
http://sipp.svn.sourceforge.net/sipp/?rev=543&view=rev
Author: charlespwright
Date: 2008-09-26 03:02:41 +0000 (Fri, 26 Sep 2008)
Log Message:
-----------
Enh: Options for log file names and whether to overwrite them.
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-09-26 03:02:03 UTC (rev 542)
+++ sipp/trunk/sipp.cpp 2008-09-26 03:02:41 UTC (rev 543)
@@ -124,6 +124,8 @@
#define SIPP_OPTION_INDEX_FILE 33
#define SIPP_OPTION_VAR 34
#define SIPP_OPTION_RTCHECK 35
+#define SIPP_OPTION_LFNAME 36
+#define SIPP_OPTION_LFOVERWRITE 37
/* Put Each option, its help text, and type in this table. */
struct sipp_option options_table[] = {
@@ -145,6 +147,9 @@
{"bind_local", "Bind socket to local IP address, i.e. the local IP address is used as the source IP address. If SIPp runs in server mode it will only listen on the local IP address instead of all IP addresses.", SIPP_OPTION_SETFLAG, &bind_local, 1},
{"buff_size", "Set the send and receive buffer size.", SIPP_OPTION_INT, &buff_size, 1},
+ {"calldebug_file", "Set the name of the call debug file.", SIPP_OPTION_LFNAME, &calldebug_lfi, 1},
+ {"calldebug_overwrite", "Overwrite the call debug file (default true).", SIPP_OPTION_LFOVERWRITE, &calldebug_lfi, 1},
+
{"cid_str", "Call ID string (default %u-%p@%s). %u=call_number, %s=ip_address, %p=process_number, %%=% (in any order).", SIPP_OPTION_STRING, &call_id_string, 1},
{"ci", "Set the local control IP address", SIPP_OPTION_IP, control_ip, 1},
{"cp", "Set the local control port number. Default is 8888.", SIPP_OPTION_INT, &control_port, 1},
@@ -160,6 +165,9 @@
"If a behavior is prefaced with a -, then it is turned off. Example: all,-bye\n",
SIPP_OPTION_DEFAULTS, &default_behaviors, 1},
+ {"error_file", "Set the name of the error log file.", SIPP_OPTION_LFNAME, &error_lfi, 1},
+ {"error_overwrite", "Overwrite the error log file (default true).", SIPP_OPTION_LFOVERWRITE, &error_lfi, 1},
+
{"f", "Set the statistics report frequency on screen. Default is 1 and default unit is seconds.", SIPP_OPTION_TIME_SEC, &report_freq, 1},
{"fd", "Set the statistics dump log report frequency. Default is 60 and default unit is seconds.", SIPP_OPTION_TIME_SEC, &report_freq_dumpLog, 1},
@@ -177,6 +185,9 @@
{"l", "Set the maximum number of simultaneous calls. Once this limit is reached, traffic is decreased until the number of open calls goes down. Default:\n"
" (3 * call_duration (s) * rate).", SIPP_OPTION_LIMIT, NULL, 1},
+ {"log_file", "Set the name of the log actions log file.", SIPP_OPTION_LFNAME, &log_lfi, 1},
+ {"log_overwrite", "Overwrite the log actions log file (default true).", SIPP_OPTION_LFOVERWRITE, &log_lfi, 1},
+
{"lost", "Set the number of packets to lose by default (scenario specifications override this value).", SIPP_OPTION_FLOAT, &global_lost, 1},
{"rtcheck", "Select the retransmisison detection method: full (default) or loose.", SIPP_OPTION_RTCHECK, &rtcheck, 1},
{"m", "Stop the test and exit when 'calls' calls are processed", SIPP_OPTION_LONG, &stop_after, 1},
@@ -192,6 +203,8 @@
{"max_socket", "Set the max number of sockets to open simultaneously. This option is significant if you use one socket per call. Once this limit is reached, traffic is distributed over the sockets already opened. Default value is 50000", SIPP_OPTION_MAX_SOCKET, NULL, 1},
{"mb", "Set the RTP echo buffer size (default: 2048).", SIPP_OPTION_INT, &media_bufsize, 1},
+ {"message_file", "Set the name of the message log file.", SIPP_OPTION_LFNAME, &message_lfi, 1},
+ {"message_overwrite", "Overwrite the message log file (default true).", SIPP_OPTION_LFOVERWRITE, &message_lfi, 1},
{"mp", "Set the local RTP echo port number. Default is 6000.", SIPP_OPTION_INT, &user_media_port, 1},
{"nd", "No Default. Disable all default behavior of SIPp which are the following:\n"
@@ -243,6 +256,8 @@
{"s", "Set the username part of the resquest URI. Default is 'service'.", SIPP_OPTION_STRING, &service, 1},
{"sd", "Dumps a default scenario (embeded in the sipp executable)", SIPP_OPTION_SCENARIO, NULL, 0},
{"sf", "Loads an alternate xml scenario file. To learn more about XML scenario syntax, use the -sd option to dump embedded scenarios. They contain all the necessary help.", SIPP_OPTION_SCENARIO, NULL, 2},
+ {"shortmessage_file", "Set the name of the short message log file.", SIPP_OPTION_LFNAME, &shortmessage_lfi, 1},
+ {"shortmessage_overwrite", "Overwrite the short message log file (default true).", SIPP_OPTION_LFOVERWRITE, &shortmessage_lfi, 1},
{"oocsf", "Load out-of-call scenario.", SIPP_OPTION_OOC_SCENARIO, NULL, 2},
{"oocsn", "Load out-of-call scenario.", SIPP_OPTION_OOC_SCENARIO, NULL, 2},
{"skip_rlimit", "Do not perform rlimit tuning of file descriptor limits. Default: false.", SIPP_OPTION_SETFLAG, &skip_rlimit, 1},
@@ -4598,7 +4613,18 @@
}
fprintf(stderr, "Defaults: %lu\n", *ptr);
}
+ case SIPP_OPTION_LFNAME:
+ REQUIRE_ARG();
+ CHECK_PASS();
+ ((struct logfile_info*)option->data)->fixedname = true;
+ strcpy(((struct logfile_info*)option->data)->file_name, argv[argi]);
break;
+ case SIPP_OPTION_LFOVERWRITE:
+ REQUIRE_ARG();
+ CHECK_PASS();
+ ((struct logfile_info*)option->data)->fixedname = true;
+ ((struct logfile_info*)option->data)->overwrite = get_bool(argv[argi], argv[argi-1]);
+ break;
default:
ERROR("Internal error: I don't recognize the option type for %s\n", argv[argi]);
}
@@ -5584,7 +5610,9 @@
void rotatef(struct logfile_info *lfi) {
char L_rotate_file_name [MAX_PATH];
- sprintf (lfi->file_name, "%s_%d_%s.log", scenario_file, getpid(), lfi->name);
+ if (!lfi->fixedname) {
+ sprintf (lfi->file_name, "%s_%d_%s.log", scenario_file, getpid(), lfi->name);
+ }
if (ringbuffer_files > 0) {
if (!lfi->ftimes) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-10-13 15:02:05
|
Revision: 549
http://sipp.svn.sourceforge.net/sipp/?rev=549&view=rev
Author: charlespwright
Date: 2008-10-13 15:01:45 +0000 (Mon, 13 Oct 2008)
Log Message:
-----------
Fix: Prevent access to sockets[] element that may be null by ensuring the read_index is always less than the number of file descriptors. From Martin H. VanLeeuwen
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-10-06 19:02:06 UTC (rev 548)
+++ sipp/trunk/sipp.cpp 2008-10-13 15:01:45 UTC (rev 549)
@@ -3140,6 +3140,10 @@
/* What index should we try reading from? */
static int read_index;
+ if (read_index >= pollnfds) {
+ read_index = 0;
+ }
+
/* We need to process any messages that we have left over. */
while (pending_messages && (loops-- > 0)) {
getmilliseconds();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-10-13 15:23:36
|
Revision: 551
http://sipp.svn.sourceforge.net/sipp/?rev=551&view=rev
Author: charlespwright
Date: 2008-10-13 15:23:10 +0000 (Mon, 13 Oct 2008)
Log Message:
-----------
Fix: Restore -rsa behavior for server mode. From Martin H. VanLeeuwen
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-10-13 15:07:39 UTC (rev 550)
+++ sipp/trunk/sipp.cpp 2008-10-13 15:23:10 UTC (rev 551)
@@ -3078,7 +3078,7 @@
// Adding a new INCOMING call !
main_scenario->stats->computeStat(CStat::E_CREATE_INCOMING_CALL);
- listener_ptr = new call(call_id, socket, src);
+ listener_ptr = new call(call_id, socket, use_remote_sending_addr ? &remote_sending_sockaddr : src);
if (!listener_ptr) {
ERROR("Out of memory allocating a call!");
}
@@ -3093,7 +3093,7 @@
if(!get_reply_code(msg)){
ooc_scenario->stats->computeStat(CStat::E_CREATE_INCOMING_CALL);
/* This should have the real address that the message came from. */
- call *call_ptr = new call(ooc_scenario, socket, src, call_id, 0 /* no user. */, socket->ss_ipv6, true, false);
+ call *call_ptr = new call(ooc_scenario, socket, use_remote_sending_addr ? &remote_sending_sockaddr : src, call_id, 0 /* no user. */, socket->ss_ipv6, true, false);
if (!call_ptr) {
ERROR("Out of memory allocating a call!");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-10-13 15:28:47
|
Revision: 550
http://sipp.svn.sourceforge.net/sipp/?rev=550&view=rev
Author: charlespwright
Date: 2008-10-13 15:07:39 +0000 (Mon, 13 Oct 2008)
Log Message:
-----------
Fix: Do not falsely report CPU congestion. From Martin H. VanLeeuwen
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-10-13 15:01:45 UTC (rev 549)
+++ sipp/trunk/sipp.cpp 2008-10-13 15:07:39 UTC (rev 550)
@@ -3145,7 +3145,7 @@
}
/* We need to process any messages that we have left over. */
- while (pending_messages && (loops-- > 0)) {
+ while (pending_messages && (loops > 0)) {
getmilliseconds();
if (sockets[read_index]->ss_msglen) {
struct sockaddr_storage src;
@@ -3156,6 +3156,7 @@
} else {
assert(0);
}
+ loops--;
}
read_index = (read_index + 1) % pollnfds;
}
@@ -3251,7 +3252,7 @@
}
/* We need to process any new messages that we read. */
- while (pending_messages && (loops-- > 0)) {
+ while (pending_messages && (loops > 0)) {
getmilliseconds();
if (sockets[read_index]->ss_msglen) {
@@ -3265,6 +3266,7 @@
} else {
assert(0);
}
+ loops--;
}
read_index = (read_index + 1) % pollnfds;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-11-18 15:16:31
|
Revision: 556
http://sipp.svn.sourceforge.net/sipp/?rev=556&view=rev
Author: charlespwright
Date: 2008-11-18 15:16:24 +0000 (Tue, 18 Nov 2008)
Log Message:
-----------
Fix: Correct bug in which UAS would not respect -m.
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-10-30 17:47:55 UTC (rev 555)
+++ sipp/trunk/sipp.cpp 2008-11-18 15:16:24 UTC (rev 556)
@@ -3348,6 +3348,9 @@
sockets_pending_reset.erase(sockets_pending_reset.begin());
}
+ if ((main_scenario->stats->GetStat(CStat::CPT_C_IncomingCallCreated) + main_scenario->stats->GetStat(CStat::CPT_C_OutgoingCallCreated)) >= stop_after) {
+ quitting = 1;
+ }
if (quitting) {
if (quitting > 11) {
/* Force exit: abort all calls */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-12-18 04:08:57
|
Revision: 558
http://sipp.svn.sourceforge.net/sipp/?rev=558&view=rev
Author: charlespwright
Date: 2008-12-18 04:08:55 +0000 (Thu, 18 Dec 2008)
Log Message:
-----------
Fix: Added missing break to option processing switch.
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-12-11 15:25:39 UTC (rev 557)
+++ sipp/trunk/sipp.cpp 2008-12-18 04:08:55 UTC (rev 558)
@@ -4647,7 +4647,7 @@
}
token = NULL;
}
- fprintf(stderr, "Defaults: %lu\n", *ptr);
+ break;
}
case SIPP_OPTION_LFNAME:
REQUIRE_ARG();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-12-22 03:36:39
|
Revision: 559
http://sipp.svn.sourceforge.net/sipp/?rev=559&view=rev
Author: charlespwright
Date: 2008-12-22 03:36:27 +0000 (Mon, 22 Dec 2008)
Log Message:
-----------
Fix: Enter congestion after buffering a write (From Martin H. VanLeeuwen).
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-12-18 04:08:55 UTC (rev 558)
+++ sipp/trunk/sipp.cpp 2008-12-22 03:36:27 UTC (rev 559)
@@ -2648,6 +2648,7 @@
if (rc < 0) {
if ((errno == EWOULDBLOCK) && (flags & WS_BUFFER)) {
buffer_write(socket, buffer, len, dest);
+ enter_congestion(socket, errno);
return len;
} else {
return rc;
@@ -2672,6 +2673,7 @@
} else if (rc <= 0) {
if ((errno == EWOULDBLOCK) && (flags & WS_BUFFER)) {
buffer_write(socket, buffer, len, dest);
+ enter_congestion(socket, errno);
return len;
}
if (useMessagef == 1) {
@@ -2696,6 +2698,7 @@
rc, len, len, buffer);
}
buffer_write(socket, buffer + rc, len - rc, dest);
+ enter_congestion(socket, errno);
}
return rc;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-12-29 16:15:14
|
Revision: 560
http://sipp.svn.sourceforge.net/sipp/?rev=560&view=rev
Author: charlespwright
Date: 2008-12-29 16:15:07 +0000 (Mon, 29 Dec 2008)
Log Message:
-----------
Fix: Correct recieved tag in short message log (From Michael Hirschbichler)
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-12-22 03:36:27 UTC (rev 559)
+++ sipp/trunk/sipp.cpp 2008-12-29 16:15:07 UTC (rev 560)
@@ -32,6 +32,7 @@
* Charles P Wright from IBM Research
* Martin Van Leeuwen
* Andy Aicken
+ * Michael Hirschbichler
*/
#define GLOBALS_FULL_DEFINITION
@@ -3042,7 +3043,7 @@
if (useShortMessagef == 1) {
struct timeval currentTime;
GET_TIME (¤tTime);
- TRACE_SHORTMSG("%s\tS\t%s\tCSeq:%s\t%s\n",
+ TRACE_SHORTMSG("%s\tR\t%s\tCSeq:%s\t%s\n",
CStat::formatTime(¤tTime),call_id, get_incoming_header_content(msg,"CSeq:"), get_incoming_first_line(msg));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2008-12-29 16:38:09
|
Revision: 563
http://sipp.svn.sourceforge.net/sipp/?rev=563&view=rev
Author: charlespwright
Date: 2008-12-29 16:38:06 +0000 (Mon, 29 Dec 2008)
Log Message:
-----------
Fix: enter_congestion is already called by flush_socket.
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2008-12-29 16:35:00 UTC (rev 562)
+++ sipp/trunk/sipp.cpp 2008-12-29 16:38:06 UTC (rev 563)
@@ -2649,7 +2649,6 @@
if (rc < 0) {
if ((errno == EWOULDBLOCK) && (flags & WS_BUFFER)) {
buffer_write(socket, buffer, len, dest);
- enter_congestion(socket, errno);
return len;
} else {
return rc;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cha...@us...> - 2009-03-17 14:44:09
|
Revision: 577
http://sipp.svn.sourceforge.net/sipp/?rev=577&view=rev
Author: charlespwright
Date: 2009-03-17 14:43:54 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
Fix: Correct lost 3PCC message. From le...@hu....
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2009-03-17 10:38:00 UTC (rev 576)
+++ sipp/trunk/sipp.cpp 2009-03-17 14:43:54 UTC (rev 577)
@@ -2600,7 +2600,6 @@
void buffer_write(struct sipp_socket *socket, char *buffer, size_t len, struct sockaddr_storage *dest) {
struct socketbuf *buf = socket->ss_out;
- struct socketbuf *prev = buf;
if (!buf) {
socket->ss_out = alloc_socketbuf(buffer, len, DO_COPY, dest);
@@ -2609,11 +2608,10 @@
}
while(buf->next) {
- prev = buf;
buf = buf->next;
}
- prev->next = alloc_socketbuf(buffer, len, DO_COPY, dest);
+ buf->next = alloc_socketbuf(buffer, len, DO_COPY, dest);
TRACE_MSG("Appended buffered message to socket %d\n", socket->ss_fd);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sri...@us...> - 2009-04-16 04:07:19
|
Revision: 580
http://sipp.svn.sourceforge.net/sipp/?rev=580&view=rev
Author: srivanuj
Date: 2009-04-16 04:07:17 +0000 (Thu, 16 Apr 2009)
Log Message:
-----------
Fix: The current wrap function is not able to handle words longer than the, provided by Mikael Rudholm
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2009-04-15 12:10:03 UTC (rev 579)
+++ sipp/trunk/sipp.cpp 2009-04-16 04:07:17 UTC (rev 580)
@@ -3536,14 +3536,19 @@
}
} else {
int m;
+ int move_back = 0;
- out[j] = '\0';
//printf("Before wrapping (pos = %d, k = %d, j = %d):\n%-*s%s\n", pos, k, j, offset, "", out);
out[k] = '\n';
pos = j - k;
+ // move_back is used to step back in the in and out buffers when a
+ // word is longer than useoffset.
+ if (i > (k + useoffset)) {
+ move_back = i - (k + useoffset);
+ i -= move_back;
+ }
k++;
- out[j] = '\0';
out = (char *)realloc(out, alloced += useoffset);
if (!out) {
ERROR_NO("realloc");
@@ -3554,8 +3559,7 @@
}
out[k + m] = ' ';
}
- j += useoffset;
- out[j] = '\0';
+ j += useoffset - move_back;
//printf("After wrapping (pos = %d, k = %d):\n%-*s%s\n", pos, k, offset, "", out);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sri...@us...> - 2009-04-16 04:25:45
|
Revision: 581
http://sipp.svn.sourceforge.net/sipp/?rev=581&view=rev
Author: srivanuj
Date: 2009-04-16 04:25:38 +0000 (Thu, 16 Apr 2009)
Log Message:
-----------
Fix: Removing .xml from logs and stats files, provided by Mikael Rudholm
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2009-04-16 04:07:17 UTC (rev 580)
+++ sipp/trunk/sipp.cpp 2009-04-16 04:25:38 UTC (rev 581)
@@ -4468,11 +4468,12 @@
if (!strcmp(argv[argi - 1], "-sf")) {
scenario_file = new char [strlen(argv[argi])+1] ;
sprintf(scenario_file,"%s", argv[argi]);
+ scenario_file = remove_pattern (scenario_file, (char*)".xml");
if (useLogf == 1) {
rotate_logfile();
}
main_scenario = new scenario(argv[argi], 0);
- main_scenario->stats->setFileName(argv[argi], (char*)".csv");
+ main_scenario->stats->setFileName(scenario_file, (char*)".csv");
} else if (!strcmp(argv[argi - 1], "-sn")) {
int i = find_scenario(argv[argi]);
@@ -4720,8 +4721,6 @@
if (scenario_file == NULL) {
scenario_file = new char [ 5 ] ;
sprintf(scenario_file, "%s", "sipp");
- } else {
- scenario_file = remove_pattern (scenario_file, (char*)".xml");
}
screen_init(print_last_stats);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <saj...@us...> - 2010-11-12 10:12:38
|
Revision: 596
http://sipp.svn.sourceforge.net/sipp/?rev=596&view=rev
Author: sajeeshs
Date: 2010-11-12 10:12:32 +0000 (Fri, 12 Nov 2010)
Log Message:
-----------
Enh: Changing Sipp version to 3.2
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2010-11-09 08:41:12 UTC (rev 595)
+++ sipp/trunk/sipp.cpp 2010-11-12 10:12:32 UTC (rev 596)
@@ -4202,7 +4202,7 @@
}
exit(EXIT_OTHER);
case SIPP_OPTION_VERSION:
- printf("\n SIPp v3.1"
+ printf("\n SIPp v3.2"
#ifdef _USE_OPENSSL
"-TLS"
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arc...@us...> - 2012-12-22 09:06:56
|
Revision: 618
http://sourceforge.net/p/sipp/code/618
Author: arcady-91
Date: 2012-12-22 09:06:54 +0000 (Sat, 22 Dec 2012)
Log Message:
-----------
Bumping version number to 3.3-beta1
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2012-12-22 02:27:38 UTC (rev 617)
+++ sipp/trunk/sipp.cpp 2012-12-22 09:06:54 UTC (rev 618)
@@ -4622,10 +4622,13 @@
}
exit(EXIT_OTHER);
case SIPP_OPTION_VERSION:
- printf("\n SIPp v3.2"
+ printf("\n SIPp v3.3-beta1"
#ifdef _USE_OPENSSL
"-TLS"
#endif
+#ifdef USE_SCTP
+ "-SCTP"
+#endif
#ifdef PCAPPLAY
"-PCAP"
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arc...@us...> - 2013-02-15 00:43:15
|
Revision: 626
http://sourceforge.net/p/sipp/code/626
Author: arcady-91
Date: 2013-02-15 00:43:12 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Mark start of early SIPp 3.4 development now that 3.3 has its own branch
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2013-02-06 23:11:47 UTC (rev 625)
+++ sipp/trunk/sipp.cpp 2013-02-15 00:43:12 UTC (rev 626)
@@ -4622,7 +4622,7 @@
}
exit(EXIT_OTHER);
case SIPP_OPTION_VERSION:
- printf("\n SIPp v3.3-beta1"
+ printf("\n SIPp v3.4-early"
#ifdef _USE_OPENSSL
"-TLS"
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arc...@us...> - 2013-02-15 00:44:57
|
Revision: 640
http://sourceforge.net/p/sipp/code/640
Author: arcady-91
Date: 2013-02-15 00:44:53 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Changing alloca to variable-length array
Modified Paths:
--------------
sipp/trunk/sipp.cpp
Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp 2013-02-15 00:44:47 UTC (rev 639)
+++ sipp/trunk/sipp.cpp 2013-02-15 00:44:53 UTC (rev 640)
@@ -3781,7 +3781,7 @@
void rtp_echo_thread (void * param)
{
- char *msg = (char*)alloca(media_bufsize);
+ char msg[media_bufsize];
size_t nr, ns;
sipp_socklen_t len;
struct sockaddr_storage remote_rtp_addr;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X