From: David Yat Sin <dyatsin@sangoma.com>
Date: Thu, 31 May 2012 17:57:42 +0000 (-0400)
Subject: Merge remote branch 'fsorig/master' into releases.3.5
X-Git-Tag: v1.2.3^2~71^2^2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb0404d0256dee4696b3ae1b62c4b1cef9327a0d;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'fsorig/master' into releases.3.5

Conflicts:
	build/modules.conf.in
	libs/freetdm/mod_freetdm/mod_freetdm.c
---

eb0404d0256dee4696b3ae1b62c4b1cef9327a0d
diff --cc libs/esl/fs_cli.c
index 7dfaf2d5a6,408c946d29..febf6d85c5
--- a/libs/esl/fs_cli.c
+++ b/libs/esl/fs_cli.c
@@@ -875,21 -901,31 +902,20 @@@ static const char *basic_gets(int *cnt
  #endif
  	return command_buf;
  }
- #endif
  
 -static const char *banner =
 -	"            _____ ____     ____ _     ___              \n"
 -	"           |  ___/ ___|   / ___| |   |_ _|             \n"
 -	"           | |_  \\___ \\  | |   | |    | |            \n"
 -	"           |  _|  ___) | | |___| |___ | |              \n"
 -	"           |_|   |____/   \\____|_____|___|            \n"
 -	"\n"
 -	"*******************************************************\n"
 -	"* Anthony Minessale II, Ken Rice,                     *\n"
 -	"* Michael Jerris, Travis Cross                        *\n"
 -	"* FreeSWITCH (http://www.freeswitch.org)              *\n"
 -	"* Paypal Donations Appreciated: paypal@freeswitch.org *\n"
 -	"* Brought to you by ClueCon http://www.cluecon.com/   *\n"
 -	"*******************************************************\n"
 -	"\n"
 -	"Type /help <enter> to see a list of commands\n\n\n";
 -
  static void print_banner(FILE *stream)
  {
 -#ifndef WIN32
 -	fprintf(stream, "%s%s", output_text_color, banner);
 -#else
 -	fprintf(stream, "%s", banner);
 -#endif
 +	fprintf(stream,
 +			
 +
 +			"\n"
 +			"*******************************************************\n"
 +			"* Netborder SS7 Gateway                               *\n"
 +			"* Powered by FreeSWITCH (http://www.freeswitch.org)   *\n"
 +			"*******************************************************\n"
 +			"\n"
 +                        "Type /help <enter> to see a list of commands\n\n\n"
 +			);
  }
  
  static void set_fn_keys(cli_profile_t *profile)
@@@ -1423,11 -1466,12 +1461,14 @@@ int main(int argc, char *argv[]
  		snprintf(cmd_str, sizeof(cmd_str), "log %s\n\n", profile->loglevel);
  		esl_send_recv(&handle, cmd_str);
  	}
+ 	if (global_profile->batch_mode) {
+ 		setvbuf(stdout, (char*)NULL, _IONBF, 0);
+ 	}
  	print_banner(stdout);
 -	esl_log(ESL_LOG_INFO, "FS CLI Ready.\nenter /help for a list of commands.\n");
 +
 +	esl_log(ESL_LOG_INFO, "Netborder SS7 CLI Ready.\nenter /help for a list of commands.\n");
  	output_printf("%s\n", handle.last_sr_reply);
 +
  	while (running > 0) {
  		int r;
  #ifdef HAVE_EDITLINE
diff --cc libs/freetdm/mod_freetdm/mod_freetdm.c
index b6a6f49ca1,35b8d9b01a..7482f73993
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@@ -26,8 -26,7 +26,8 @@@
   * Anthony Minessale II <anthm@freeswitch.org>
   * Moises Silva <moy@sangoma.com>
   * David Yat Sin <dyatsin@sangoma.com>
 + * James Zhang <jzhang@sangoma.com>
-  *
+  * Gideon Sadan <gsadan@sangoma.com>
   *
   * mod_freetdm.c -- FreeTDM Endpoint Module
   *