[Asterisk-cvs] asterisk/channels/h323 chan_h323.h,1.42,1.43

[jeremy at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels/h323
In directory mongoose.digium.com:/tmp/cvs-serv26681/h323

Modified Files:
	chan_h323.h 
Log Message:
Optimize global/user/peer configuration call options. Bug #4336

Index: chan_h323.h
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/chan_h323.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- chan_h323.h	19 May 2005 19:13:19 -0000	1.42
+++ chan_h323.h	21 May 2005 17:09:19 -0000	1.43
@@ -36,11 +36,14 @@
 	int				noFastStart;
 	int				noH245Tunneling;
 	int				noSilenceSuppression;
-/*	unsigned int	port; */
 	int				progress_setup;
 	int				progress_alert;
 	int				progress_audio;
 	int				dtmfcodec;
+	int				dtmfmode;
+	int				capability;
+	int				bridge;
+	int				nat;
 } call_options_t;
 
 /* structure to hold the valid asterisk users */
@@ -51,14 +54,10 @@
 	char callerid[80];
 	char accountcode[20];
 	int amaflags;
-	int capability;
-	int bridge;
-	int nat;
-	int dtmfmode;
 	int host;
-	call_options_t options;
-	struct ast_ha *ha;
 	struct sockaddr_in addr;
+	struct ast_ha *ha;
+	call_options_t options;
 	struct oh323_user *next;
 };
 
@@ -67,10 +66,6 @@
 struct oh323_peer {
 	char name[80];
 	char mailbox[80];
-	int capability;
-	int bridge;
-	int nat;
-	int dtmfmode;
 	int delme;
 	struct sockaddr_in addr;
 	struct ast_ha *ha;