Importing files for 1.2.30.4 release

git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.2.30.4@162871 65c4cc65-6c06-0410-ace0-fbb531ad65f3

.version

@@ -1 +1 @@
-1.2.30.2
+1.2.30.4

ChangeLog

@@ -1,4 +1,30 @@
-2008-07-23  Tilghman Lesher <tlesher@digium.com>
+2008-12-10  Tilghman Lesher <tlesher@digium.com>
+
+	* Asterisk 1.2.30.4 released
+
+2008-12-10 21:06 +0000 [r162868]  Tilghman Lesher <tlesher@digium.com>
+
+	* channels/chan_iax2.c: Fix for AST-2008-012
+
+2008-12-05 20:50 +0000 [r161421]  Sean Bright <sean.bright@gmail.com>
+
+	* include/asterisk/astobj2.h, astobj2.c: Fix build errors on
+	  FreeBSD (uint -> unsigned int). (closes issue #14006) Reported
+	  by: alphaque Patches: astobj2.h-patch uploaded by alphaque
+	  (license 259) (Slightly modified by seanbright)
+
+2008-12-01  Tilghman Lesher <tlesher@digium.com>
+
+	* Asterisk 1.2.30.3 released
+
+2008-11-25 21:37 +0000 [r159245]  Tilghman Lesher <tlesher@digium.com>
+
+	* channels/chan_iax2.c: Regression fix for last security fix. Set
+	  the iseqno correctly. (closes issue #13918) Reported by:
+	  ffloimair Patches: 20081119__bug13918.diff.txt uploaded by
+	  Corydon76 (license 14) Tested by: ffloimair
+
+2008-08-09  Tilghman Lesher <tlesher@digium.com>
 
 	* Asterisk 1.2.30.2 released
 

astobj2.c

@@ -294,7 +294,7 @@ static int hash_zero(const void *user_obj, const int flags)
  * A container is just an object, after all!
  */
 struct ao2_container *
-ao2_container_alloc(const uint n_buckets, ao2_hash_fn hash_fn,
+ao2_container_alloc(const unsigned int n_buckets, ao2_hash_fn hash_fn,
 		ao2_callback_fn cmp_fn)
 {
 	/* XXX maybe consistency check on arguments ? */

channels/chan_iax2.c

@@ -2750,7 +2750,7 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in
 	if (peername) {
 		var = ast_load_realtime("iaxpeers", "name", peername, "host", "dynamic", NULL);
 		if (!var && sin)
-			var = ast_load_realtime("iaxpeers", "name", peername, "host", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr));
+			var = ast_load_realtime("iaxpeers", "name", peername, "host", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr), (char *) NULL);
 	} else if (sin) {
 		char porta[25];
 		ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr);
@@ -2874,7 +2874,7 @@ static struct iax2_user *realtime_user(const char *username, struct sockaddr_in
 
 	var = ast_load_realtime("iaxusers", "name", username, "host", "dynamic", NULL);
 	if (!var && sin)
-		var = ast_load_realtime("iaxusers", "name", username, "host", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr));
+		var = ast_load_realtime("iaxusers", "name", username, "host", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr), (char *) NULL);
 	if (!var && sin) {
 		char porta[6];
 		snprintf(porta, sizeof(porta), "%d", ntohs(sin->sin_port));
@@ -3102,7 +3102,7 @@ struct parsed_dial_string {
 static int send_apathetic_reply(unsigned short callno, unsigned short dcallno, struct sockaddr_in *sin, int command, int ts, unsigned char seqno)
 {
 	struct ast_iax2_full_hdr f = { .scallno = htons(0x8000 | callno), .dcallno = htons(dcallno),
-		.ts = htonl(ts), .iseqno = seqno, .oseqno = seqno, .type = AST_FRAME_IAX,
+		.ts = htonl(ts), .iseqno = seqno, .oseqno = 0, .type = AST_FRAME_IAX,
 		.csub = compress_subclass(command) };
 
 	return sendto(defaultsockfd, &f, sizeof(f), 0, (struct sockaddr *)sin, sizeof(*sin));
@@ -6842,7 +6842,7 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
 		/* Deal with POKE/PONG without allocating a callno */
 		if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_POKE) {
 			/* Reply back with a PONG, but don't care about the result. */
-			send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_PONG, ntohs(fh->ts), fh->oseqno);
+			send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_PONG, ntohs(fh->ts), fh->iseqno + 1);
 			return 1;
 		} else if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_ACK && dcallno == 1) {
 			/* Ignore */

include/asterisk/astobj2.h

@@ -332,7 +332,7 @@ struct ao2_container;
  *
  * destructor is set implicitly.
  */
-struct ao2_container *ao2_container_alloc(const uint n_buckets,
+struct ao2_container *ao2_container_alloc(const unsigned int n_buckets,
 		ao2_hash_fn hash_fn, ao2_callback_fn cmp_fn);
 
 /*!
@@ -529,11 +529,11 @@ struct ao2_iterator {
 	/*! current bucket */
 	int bucket;
 	/*! container version */
-	uint c_version;
+	unsigned int c_version;
 	/*! pointer to the current object */
 	void *obj;
 	/*! container version when the object was created */
-	uint version;
+	unsigned int version;
 };
 
 struct ao2_iterator ao2_iterator_init(struct ao2_container *c, int flags);