← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to lib/kernel/src/inet6_tcp_dist.erl

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/kernel/src/inet6_tcp_dist.erl
1
1
%%
2
2
%% %CopyrightBegin%
3
 
%% 
4
 
%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
5
 
%% 
 
3
%%
 
4
%% Copyright Ericsson AB 1997-2011. All Rights Reserved.
 
5
%%
6
6
%% The contents of this file are subject to the Erlang Public License,
7
7
%% Version 1.1, (the "License"); you may not use this file except in
8
8
%% compliance with the License. You should have received a copy of the
9
9
%% Erlang Public License along with this software. If not, it can be
10
10
%% retrieved online at http://www.erlang.org/.
11
 
%% 
 
11
%%
12
12
%% Software distributed under the License is distributed on an "AS IS"
13
13
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
14
14
%% the License for the specific language governing rights and limitations
15
15
%% under the License.
16
 
%% 
 
16
%%
17
17
%% %CopyrightEnd%
18
18
%%
19
19
-module(inet6_tcp_dist).
87
87
accept_loop(Kernel, Listen) ->
88
88
    case inet6_tcp:accept(Listen) of
89
89
        {ok, Socket} ->
90
 
            Kernel ! {accept,self(),Socket,inet,tcp},
 
90
            Kernel ! {accept,self(),Socket,inet6,tcp},
91
91
            controller(Kernel, Socket),
92
92
            accept_loop(Kernel, Listen);
93
93
        Error ->
162
162
                                        inet:getll(S)
163
163
                                end,
164
164
                      f_address = fun get_remote_id/2,
165
 
                      mf_tick = {?MODULE, tick},
166
 
                      mf_getstat = {?MODULE,getstat}
 
165
                      mf_tick = fun ?MODULE:tick/1,
 
166
                      mf_getstat = fun ?MODULE:getstat/1
167
167
                     },
168
168
                    dist_util:handshake_other_started(HSData);
169
169
                {false,IP} ->
236
236
                              timer = Timer,
237
237
                              this_flags = 0,
238
238
                              other_version = Version,
239
 
                              f_send = fun inet_tcp:send/2,
240
 
                              f_recv = fun inet_tcp:recv/3,
 
239
                              f_send = fun inet6_tcp:send/2,
 
240
                              f_recv = fun inet6_tcp:recv/3,
241
241
                              f_setopts_pre_nodeup = 
242
242
                              fun(S) ->
243
243
                                      inet:setopts
262
262
                                   address = {Ip,TcpPort},
263
263
                                   host = Address,
264
264
                                   protocol = tcp,
265
 
                                   family = inet}
 
265
                                   family = inet6}
266
266
                              end,
267
267
                              mf_tick = fun ?MODULE:tick/1,
268
268
                              mf_getstat = fun ?MODULE:getstat/1,
302
302
            Host = lists:append(Tail),
303
303
            case split_node(Host, $., []) of
304
304
                [_] when LongOrShortNames =:= longnames ->
305
 
                    error_msg("** System running to use "
306
 
                              "fully qualified "
307
 
                              "hostnames **~n"
308
 
                              "** Hostname ~s is illegal **~n",
309
 
                              [Host]),
310
 
                    ?shutdown(Node);
 
305
                    case inet_parse:ipv6strict_address(Host) of
 
306
                        {ok, _} ->
 
307
                            [Name, Host];
 
308
                        _ ->
 
309
                            error_msg("** System running to use "
 
310
                                      "fully qualified "
 
311
                                      "hostnames **~n"
 
312
                                      "** Hostname ~s is illegal **~n",
 
313
                                      [Host]),
 
314
                            ?shutdown(Node)
 
315
                    end;
311
316
                L when length(L) > 1, LongOrShortNames =:= shortnames ->
312
317
                    error_msg("** System NOT running to use fully qualified "
313
318
                              "hostnames **~n"