NSIS-ka
A free C++ implementation of NSIS protocols

Changeset 4181


Ignore:
Timestamp:
Jul 31, 2009, 10:43:42 AM (8 years ago)
Author:
bless
Message:
  • converted the fi_service into a pointer, so if FlowInfo? module is not used, it simply is set to NULL
Location:
ntlp/branches/20081127-merge-mobility-mk3/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ntlp/branches/20081127-merge-mobility-mk3/src/ntlp_starter.cpp

    r4166 r4181  
    357357                         nli_tmpl,
    358358                         *addresses,
    359                          *param.fi_service,
     359                         param.fi_service,
    360360                         secrets,
    361361                         nslptable,
     
    402402
    403403       
    404   SignalingNTLPParam sigpar(pm,  nli_tmpl, *addresses, *param.fi_service, nslptable, gconf.getpar<uint16>(gistconf_udpport));
     404  SignalingNTLPParam sigpar(pm,  nli_tmpl, *addresses, nslptable, gconf.getpar<uint16>(gistconf_udpport), param.fi_service);
    405405  ThreadStarter<SignalingNTLP,SignalingNTLPParam> signaling(1,sigpar); 
    406406       
  • ntlp/branches/20081127-merge-mobility-mk3/src/ntlp_statemodule.h

    r4147 r4181  
    7878                   nli &nli_tmpl,
    7979                   AddressList &addresses,
    80                    Flowinfo &fi_service,
     80                   Flowinfo *fi_service,
    8181                   secretmanager& secrets,
    8282                   NSLPtable& nslptable,
     
    8989  nli &nli_tmpl;
    9090  AddressList &addresses;
    91   Flowinfo &fi_service;
     91  Flowinfo *fi_service;
    9292  uint32 retrylimit;
    9393  uint32 retryperiod;
  • ntlp/branches/20081127-merge-mobility-mk3/src/ntlp_statemodule_main.cpp

    r4147 r4181  
    7676                                   nli &nli_tmpl,
    7777                                   AddressList &addresses,
    78                                    Flowinfo &fi_service,
     78                                   Flowinfo* fi_service,
    7979                                   secretmanager& secrets,
    8080                                   NSLPtable& nslptable,
  • ntlp/branches/20081127-merge-mobility-mk3/src/signalingmodule_ntlp.cpp

    r4147 r4181  
    8181 * SignalingNTLPParam constructor, take over parameters for Signaling Module
    8282 * @param pm -- The Protocol map containing pointers to all TP Modules in use
    83  * @param localnliv4 -- A NLI describing the peer, contains the IPv4 address which is to be sent to peers for contacting this peer
    84  * @param localnliv6 -- A NLI describing the peer, contains the IPv6 address which is to be sent to peers for contacting this peer
     83 * @param addresses -- an Address List containing IP addresses of the node
    8584 * @param nslptable -- The table holding the addresses of registered NSLP clients
    8685 * @param well_known_port -- The UDP Well-Known Port of GIST
     
    9392                                       nli &nli_tmpl,
    9493                                       AddressList &addresses,
    95                                        Flowinfo &fi_service,
    9694                                       NSLPtable& nslptable,
    9795                                       uint16 well_known_port,
     96                                       Flowinfo *fi_service,
    9897                                       uint32 sleep_time,
    9998                                       bool see, bool sre
     
    103102    nli_tmpl(nli_tmpl),
    104103    addresses(addresses),
    105     fi_service(fi_service),
    106104    source(message::qaddr_signaling),
    107105    send_error_expedited(see),
    108106    send_reply_expedited(sre),
    109107    nslptable(nslptable),
    110     well_known_port(well_known_port)
     108    well_known_port(well_known_port),
     109    fi_service(fi_service)
    111110{
    112111} // end constructor
  • ntlp/branches/20081127-merge-mobility-mk3/src/signalingmodule_ntlp.h

    r4147 r4181  
    6262  nli &nli_tmpl;
    6363  AddressList &addresses;
    64   Flowinfo &fi_service;
    6564  const  message::qaddr_t source;
    6665  const  bool send_error_expedited;
     
    6968  NSLPtable& nslptable;
    7069  uint16 well_known_port;
     70  Flowinfo *fi_service;
    7171
    7272  SignalingNTLPParam(protocol_map_t pm,
    7373                     nli &nli_tmpl,
    7474                     AddressList &addresses,
    75                      Flowinfo &fi_service,
    7675                     NSLPtable& nslptable,
    7776                     uint16 well_known_port,
     77                     Flowinfo *fi_service= NULL,
    7878                     uint32 sleep_time = ThreadParam::default_sleep_time,
    7979                     bool see = true,
Note: See TracChangeset for help on using the changeset viewer.