Commit bc42bc24 authored by Andreas Schmidt's avatar Andreas Schmidt
Browse files

Merge branch 'develop' into feature/congestionControl

parents 733996d1 a9f17210

examples/sender.py

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ host = sys.argv[1] 
port = int(sys.argv[2])

localport = int(sys.argv[3])



s = prrt.PrrtSocket(("127.0.1.1", localport))

s = prrt.PrrtSocket(("127.0.1.1", localport), mtu=150)

s.connect((host, port))



for i in range(10):

prrt/__init__.py

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 


from ._version import get_versions

__version__ = get_versions()['version']

del get_versions

prrt/cprrt.pxd

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ cdef extern from "proto/socket.h": 


    ctypedef prrtSocket PrrtSocket



    cdef PrrtSocket* PrrtSocket_create(const uint32_t target_delay)

    cdef PrrtSocket* PrrtSocket_create(const uint32_t mtu, const uint32_t target_delay)

    bint PrrtSocket_bind(PrrtSocket *sock_ptr, const_char *ipAddress, const uint16_t port)

    int PrrtSocket_close(const PrrtSocket *sock_ptr)

    int PrrtSocket_connect(PrrtSocket *sock_ptr, const_char *host, const uint16_t port)

prrt/proto/CMakeLists.txt

+7 −2
Original line number Diff line number Diff line 
add_library(PRRT ../defines.h

set (PRRT_SOURCES ../defines.h

        block.c block.h

        bbr.c bbr.h

        channelStateInformation.c channelStateInformation.h
@@ -6,7 +6,6 @@ add_library(PRRT ../defines.h 
        codingParams.c codingParams.h

        receiver.c receiver.h

        socket.c socket.h

        ../xlap/xlap.c ../xlap/xlap.h

        applicationConstraints.c applicationConstraints.h

        processes/dataReceiver.c processes/dataReceiver.h

        processes/dataTransmitter.c processes/dataTransmitter.h
@@ -22,4 +21,10 @@ add_library(PRRT ../defines.h 
        types/packet.c types/packet.h

        vdmcode/block_code.c vdmcode/block_code.h types/packetTracking.c types/packetTracking.h types/rateSample.c types/rateSample.h)



if (XLAP)

    set(PRRT_SOURCES ${PRRT_SOURCES} ../xlap/xlap.c ../xlap/xlap.h)

endif()



add_library(PRRT ${PRRT_SOURCES})



target_link_libraries(PRRT rt)

prrt/proto/pp.h

0 → 100644
+379 −0

File added.

Preview size limit exceeded, changes collapsed.