X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Futils%2Floadtest.c;h=b376f7d5c0faca27f22ceab22decf0b7f8c6943b;hb=62e9c724d4d37e08ddf34a208840c39b2a3fbcbf;hp=ad685ff30eba7becf00aba365052ba92f02b3791;hpb=15cb325a108a62ba968ef09cfbc64035e63f868b;p=citadel.git

diff --git a/citadel/utils/loadtest.c b/citadel/utils/loadtest.c
index ad685ff30..b376f7d5c 100644
--- a/citadel/utils/loadtest.c
+++ b/citadel/utils/loadtest.c
@@ -89,7 +89,7 @@ char *words[] = {
 	"tempor","tincidunt","phasellus","justo","purus","pharetra","ut","ultricies","nec","consequat","vel",
 	"nisi","fusce","vitae","velit","at","libero","sollicitudin","sodales","aenean","mi","libero","ultrices",
 	"id","suscipit","vitae","dapibus","eu","metus","aenean","vestibulum","nibh","ac","massa","vivamus",
-	"vestibulum","libero","vitae","purus","in","hac","habitasse","platea","dictumst","curabitur",
+	"vestibulum","libero","vitae","purus","in","hac","maga","habitasse","platea","dictumst","curabitur",
 	"blandit","nunc","non","arcu","ut","nec","nibh","morbi","quis","leo","vel","magna","commodo","rhoncus",
 	"donec","congue","leo","eu","lacus","pellentesque","at","erat","id","mi","consequat","congue","praesent",
 	"a","nisl","ut","diam","interdum","molestie","fusce","suscipit","rhoncus","sem","donec","pretium",
@@ -209,8 +209,8 @@ char *random_rooms[] = {
 	"Five Guys Load Testing and Fries"
 };
 int nrooms = sizeof(random_rooms) / sizeof(char *);
-
 char *test_user = "Load Test User";
+char *test_pass = "TheTestPW";
 
 void perform_random_thing(int serv_sock) {
 	int op = random() % 3;
@@ -281,7 +281,7 @@ void do_stuff(int serv_sock) {
 	snprintf(buf, sizeof buf, "USER %s", test_user);
 	serv_puts(serv_sock, buf);
 	serv_gets(serv_sock, buf);
-	snprintf(buf, sizeof buf, "PASS 640k_enough_ne1");
+	snprintf(buf, sizeof buf, "PASS %s", test_pass);
 	serv_puts(serv_sock, buf);
 	serv_gets(serv_sock, buf);
 	snprintf(buf, sizeof(buf), "GOTO %s", random_rooms[0]);
@@ -307,13 +307,13 @@ void setup_accounts(int serv_sock) {
 	snprintf(buf, sizeof buf, "CREU %s", test_user);
 	serv_puts(serv_sock, buf);
 	serv_gets(serv_sock, buf);
-	snprintf(buf, sizeof buf, "ASUP %s|640k_enough_ne1|0|||6|", test_user);
+	snprintf(buf, sizeof buf, "ASUP %s|%s|0|||6|", test_user, test_pass);
 	serv_puts(serv_sock, buf);
 	serv_gets(serv_sock, buf);
 	snprintf(buf, sizeof buf, "USER %s", test_user);
 	serv_puts(serv_sock, buf);
 	serv_gets(serv_sock, buf);
-	snprintf(buf, sizeof buf, "PASS 640k_enough_ne1");
+	snprintf(buf, sizeof buf, "PASS %s", test_pass);
 	serv_puts(serv_sock, buf);
 	serv_gets(serv_sock, buf);
 
@@ -322,18 +322,12 @@ void setup_accounts(int serv_sock) {
 		serv_puts(serv_sock, buf);
 		serv_gets(serv_sock, buf);
 	}
-
 }
 
 void *loadtest(void *blah) {
 	char buf[SIZ];
 	int serv_sock;
 
-	serv_sock = uds_connectsock(file_citadel_admin_socket);
-	serv_gets(serv_sock, buf);
-	setup_accounts(serv_sock);
-	close(serv_sock);
-
 	serv_sock = uds_connectsock(file_citadel_socket);
 	serv_gets(serv_sock, buf);
 	do_stuff(serv_sock);
@@ -374,6 +368,12 @@ int main(int argc, char **argv) {
 		exit(errno);
 	}
 
+	int serv_sock = uds_connectsock(file_citadel_admin_socket);
+	char buf[SIZ];
+	serv_gets(serv_sock, buf);
+	setup_accounts(serv_sock);
+	close(serv_sock);
+
 	printf("\033[8Hthread   num_ops\n------ -----------");
 
 	for (a=0; a<(nthreads-1); ++a) {