revert part of 390e6713cce81e6dcc8e94726d34e089aa3d883a
FS-6334 --resolve mod_rayo: deadlock when creating input voice component
Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
mod_skinny: make 7925g work

Cisco 7925G seem to work only with the correct conference_id2 and
rtptimeout set, so add protocol 11 definition fields and set
conference_id2 correctly.

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Nathan Neulinger <nneul@neulinger.org>
mod_skinny: wait up to 5 seconds for OpenRecvChannelAck

WiFi phones like the 7925g may take longer than just one second to
acknowledge the open receive message. Increase the timeout to 5 seconds.

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Nathan Neulinger <nneul@neulinger.org>
mod_skinny: remove unknown field from access_status

Cisco 7925g send access status message with just 8 byte of payload data.
Since we don't interpret the unknown 3rd field anyway, remove it. This
will prevent the first register to fail.

Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Nathan Neulinger <nneul@neulinger.org>
Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch