Changeset 4618


Ignore:
Timestamp:
Jun 29, 2009, 4:49:46 PM (15 years ago)
Author:
Christoph Mayer
Message:

alle uint_8 auf uint_16 welche an serialisierung beteiligt sind

Files:
11 edited

Legend:

Unmodified
Added
Removed
  • sample/pingpong/PingPongMessage.h

    r2413 r4618  
    1818public:
    1919        PingPongMessage();
    20         PingPongMessage( uint8_t _id );
     20        PingPongMessage( uint16_t _id );
    2121        virtual ~PingPongMessage();
    2222
    2323        string info();
    24         uint8_t getid();
     24        uint16_t getid();
    2525private:
    26         uint8_t id;
     26        uint16_t id; //TODO: was uint8_t
    2727};
    2828
  • source/ariba/communication/EndpointDescriptor.h

    r3705 r4618  
    100100
    101101sznBeginDefault( ariba::communication::EndpointDescriptor, X ) {
    102         uint8_t unspec = isUnspec;
     102        uint16_t unspec = isUnspec; //TODO: was uint8_t
    103103
    104104        X && unspec && VO(locator);
  • source/ariba/communication/messages/AribaBaseMsg.h

    r4617 r4618  
    8585
    8686private:
    87         uint8_t state;          // the link message type
     87        uint16_t state;         // the link message type //TODO: was uint8_t
    8888        LinkID localLink;       // the local link id
    8989        LinkID remoteLink;      // the remote link id
     
    9494
    9595sznBeginDefault( ariba::communication::AribaBaseMsg, X ) {
    96         uint8_t x = 0xff;
    97         X && state && x && &localLink && &remoteLink && Payload();
     96        X && state && &localLink && &remoteLink && Payload();
    9897} sznEnd();
    9998
  • source/ariba/communication/modules/transport/tcp/TCPTransport.cpp

    r4598 r4618  
    203203                                        // converting message
    204204                                        logging_debug( "converting message" );
    205 
    206 
    207                                         std::cout << "XXXXXXXXXXXXreceived data on tcp transport: " << data << std::endl;
    208 
    209 
     205                                        //std::cout << "XXXXXXXXXXXXreceived data on tcp transport: " << data << std::endl;
    210206                                        Message* msg = new Message(data);
     207
    211208                                        std::ostringstream o;
    212209                                        o << (peer->get_ip_str() + 7) << ":" << remotePort;
     
    243240
    244241        Data data = data_serialize( message );
    245 
    246 
    247         std::cout << "XXXXXXXXXXXXXsending out data using tcp transport: " << data << std::endl;
    248 
    249 
    250 
     242        //std::cout << "XXXXXXXXXXXXXsending out data using tcp transport: " << data << std::endl;
    251243
    252244        const_cast<Message*>(message)->dropPayload();
  • source/ariba/overlay/messages/LinkRequest.h

    r3690 r4618  
    2424private:
    2525        bool free_endpoint_;
    26         uint8_t flags;
     26        uint16_t flags; //TODO: was uint8_t
    2727        uint32_t nonce;
    2828        const EndpointDescriptor* endpoint;
  • source/ariba/overlay/messages/OverlayMsg.h

    r3690 r4618  
    9090
    9191private:
    92         uint8_t type;
     92        uint16_t type; //TODO: was uint8_t
    9393        ServiceID service;
    9494        NodeID sourceNode;
  • source/ariba/overlay/modules/chord/messages/ChordMessage.h

    r3690 r4618  
    9797
    9898private:
    99         uint8_t type;
    100         uint8_t hop_count;
     99        uint16_t type; //TODO: was uint8_t
     100        uint16_t hop_count; //TODO: was uint8_t
    101101        NodeID source, destination;
    102102};
  • source/ariba/overlay/modules/chord/messages/Discovery.h

    r3690 r4618  
    108108
    109109private:
    110         uint8_t follow_type;
    111         uint8_t ttl;
     110        uint16_t follow_type; //TODO: was uint8_t
     111        uint16_t ttl; //TODO: was uint8_t
    112112        EndpointDescriptor* source_endpoint;
    113113//      NodeEndpointList descriptors;
  • source/ariba/overlay/modules/onehop/messages/OneHopMessage.h

    r3705 r4618  
    6868
    6969private:
    70         uint8_t type;
     70        uint16_t type; // TODO: was uint8_t
    7171};
    7272
  • source/ariba/utility/types/Identifier.h

    r4614 r4618  
    569569/* serializers */
    570570sznBeginDefault( ariba::utility::Identifier, X ) {
     571
    571572        // calculate length of key
    572573        uint16_t len = array_size*sizeof(mp_limb_t);
    573         uint8_t unspec = isUnspec;
     574        uint16_t unspec = isUnspec; //TODO: was uint8_t
    574575
    575576        // only serialize the lower 16 bits of keyLength
    576577        X && unspec && len;
    577578
    578         /*
    579         if (X.isDeserializer()){
    580                 if(len != array_size*sizeof(mp_limb_t)){
    581                         std::cout << "len: " << len << ", array_size: "
    582                                 << array_size << ", sizeof(mp_limb_t): " << sizeof(mp_limb_t) << std::endl;
    583                         assert(false);
    584                 }
    585         }
    586         */
    587 
    588579        // serialize the identifier
    589580        for (int i=array_size-1; i>=0; i--) X && key[i];
    590581
    591         // when deserializing reset unspec flag
     582        // when deserializing set unspec flag
    592583        if (X.isDeserializer()){
    593                 //isUnspec = unspec;
    594                 isUnspec = false;
    595                 //std::cout << "isUnspec: " << (isUnspec ? "true" : "false") << "   " << "unspec: " << (int)unspec << std::endl;
     584                isUnspec = unspec;
    596585        }
    597586
  • source/ariba/utility/types/OverlayParameterSet.h

    r3718 r4618  
    6464
    6565private:
    66         uint8_t structure;
     66        uint16_t structure; //TODO: was uint8_t
    6767
    6868};
Note: See TracChangeset for help on using the changeset viewer.