← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ejabberd/trusty-proposed

« back to all changes in this revision

Viewing changes to src/stun/stun_codec.erl

  • Committer: Bazaar Package Importer
  • Author(s): Konstantin Khomoutov, Konstantin Khomoutov, Gerfried Fuchs
  • Date: 2010-04-06 13:00:03 UTC
  • mfrom: (1.1.14 upstream) (13.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20100406130003-ub626hx26kgazp79
Tags: 2.1.3-1
http://bugs.debian.org/578722
[ Konstantin Khomoutov ]
* New upstream release.
* Remove obsolete c2s-p1-fsm.patch
* Remove obsolete ejabberdctl-help-dashes.patch
* Update mod_admin_extra to revision 1078
* Refresh shared_roster_recent.patch
* Refresh shared_roster_online.patch
* Clarify how to do mixed IPv4/IPv6 setup of ejabberd listeners
  as suggested by Marc Dequènes in the discussion of #573801.

[ Gerfried Fuchs ]
* Remove Torsten Werner from maintainer field on his own wish - thanks for
  your work so far! (closes: #578722)
* Promote Konstantin to Maintainer to best fit reality. Enjoy. :)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/stun/stun_codec.erl
118
118
    Msg.
119
119
 
120
120
enc_attrs(Msg) ->
121
 
    concat_binary(
 
121
    list_to_binary(
122
122
      [enc_attr(?STUN_ATTR_SOFTWARE, Msg#stun.'SOFTWARE'),
123
123
       enc_addr(?STUN_ATTR_MAPPED_ADDRESS, Msg#stun.'MAPPED-ADDRESS'),
124
124
       enc_xor_addr(?STUN_ATTR_XOR_MAPPED_ADDRESS,
230
230
    <<>>;
231
231
enc_unknown_attrs(Attrs) ->
232
232
    enc_attr(?STUN_ATTR_UNKNOWN_ATTRIBUTES,
233
 
             concat_binary([<<Attr:16>> || Attr <- Attrs])).
 
233
             list_to_binary([<<Attr:16>> || Attr <- Attrs])).
234
234
 
235
235
%%====================================================================
236
236
%% Auxiliary functions