Optimize global/user/peer configuration call options. Bug #4336

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5753 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 6 insertions, 11 deletions

diff --git a/channels/h323/chan_h323.h b/channels/h323/chan_h323.h
index ca54588e5..c82edab65 100755
--- a/channels/h323/chan_h323.h
+++ b/channels/h323/chan_h323.h
@@ -36,11 +36,14 @@ typedef struct call_options {
 	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 @@ struct oh323_user {
 	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_user {
 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;