Merge branch 'weiss-check-packet-type' into 3

src/ejabberd_c2s.erl

@@ -1208,13 +1208,7 @@ session_established2(El, StateData) ->
 		       _ ->
 			   Err = jlib:make_error_reply(NewEl,
 						       ?ERR_JID_MALFORMED),
-			   case is_stanza(Err) of
-			     true ->
-				 send_stanza(NewStateData, Err);
-			     false ->
-				 send_element(NewStateData, Err),
-				 NewStateData
-			   end
+			   send_packet(NewStateData, Err)
 		     end;
 		 _ ->
 		     case Name of
@@ -1647,7 +1641,7 @@ handle_info({route, From, To,
 	       jlib:replace_from_to_attrs(jlib:jid_to_string(From),
 					  jlib:jid_to_string(To), NewAttrs),
 	    FixedPacket = #xmlel{name = Name, attrs = Attrs2, children = Els},
-	    SentStateData = send_stanza(NewState, FixedPacket),
+	    SentStateData = send_packet(NewState, FixedPacket),
 	    ejabberd_hooks:run(user_receive_packet,
 			       SentStateData#state.server,
 			       [SentStateData#state.jid, From, To, FixedPacket]),
@@ -1838,6 +1832,19 @@ send_stanza(StateData, Stanza) ->
     send_element(StateData, Stanza),
     StateData.
 
+send_packet(StateData, Packet) when StateData#state.mgmt_state == active;
+				    StateData#state.mgmt_state == pending ->
+    case is_stanza(Packet) of
+      true ->
+	  send_stanza(StateData, Packet);
+      false ->
+	  send_element(StateData, Packet),
+	  StateData
+    end;
+send_packet(StateData, Stanza) ->
+    send_element(StateData, Stanza),
+    StateData.
+
 send_header(StateData, Server, Version, Lang)
     when StateData#state.xml_socket ->
     VersionAttr = case Version of
@@ -2344,7 +2351,7 @@ resend_subscription_requests(#state{user = User,
 	ejabberd_hooks:run_fold(resend_subscription_requests_hook,
 				Server, [], [User, Server]),
     lists:foldl(fun (XMLPacket, AccStateData) ->
-			send_stanza(AccStateData, XMLPacket)
+			send_packet(AccStateData, XMLPacket)
 		end,
 		StateData,
 		PendingSubscriptions).