May 2012 - rtmpdump - lists.mplayerhq.hu

[PATCH] Allocate the channel arrays dynamically
by Martin Storsjo 30 May '12

30 May '12

This avoids having to allocate space for all theoretical channels if most of them aren't used. This drops the size of the full RTMP struct from over 1200 KB to 16 KB (on 64 bit), and as long as only channels with a low number are used, the amount of total allocated memory stays far below what it was before. --- librtmp/rtmp.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++----- librtmp/rtmp.h | 8 +++++--- 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 37a05ad..74d5552 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -1101,7 +1101,8 @@ RTMP_GetNextMediaPacket(RTMP *r, RTMPPacket *packet) if (bHasMediaPacket) r->m_bPlaying = TRUE; else if (r->m_sb.sb_timedout && !r->m_pausing) - r->m_pauseStamp = r->m_channelTimestamp[r->m_mediaChannel]; + r->m_pauseStamp = r->m_mediaChannel < r->m_channelsAllocatedIn ? + r->m_channelTimestamp[r->m_mediaChannel] : 0; return bHasMediaPacket; } @@ -1873,7 +1874,8 @@ RTMP_SendPause(RTMP *r, int DoPause, int iTime) int RTMP_Pause(RTMP *r, int DoPause) { if (DoPause) - r->m_pauseStamp = r->m_channelTimestamp[r->m_mediaChannel]; + r->m_pauseStamp = r->m_mediaChannel < r->m_channelsAllocatedIn ? + r->m_channelTimestamp[r->m_mediaChannel] : 0; return RTMP_SendPause(r, DoPause, r->m_pauseStamp); } @@ -2828,7 +2830,8 @@ HandleCtrl(RTMP *r, const RTMPPacket *packet) break; if (!r->m_pausing) { - r->m_pauseStamp = r->m_channelTimestamp[r->m_mediaChannel]; + r->m_pauseStamp = r->m_mediaChannel < r->m_channelsAllocatedIn ? + r->m_channelTimestamp[r->m_mediaChannel] : 0; RTMP_SendPause(r, TRUE, r->m_pauseStamp); r->m_pausing = 1; } @@ -2973,6 +2976,26 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *packet) nSize = packetSize[packet->m_headerType]; + if (packet->m_nChannel >= r->m_channelsAllocatedIn) + { + int n = packet->m_nChannel + 10; + int *timestamp = realloc(r->m_channelTimestamp, sizeof(int) * n); + RTMPPacket **packets = realloc(r->m_vecChannelsIn, sizeof(RTMPPacket*) * n); + if (!timestamp) + free(r->m_channelTimestamp); + if (!packets) + free(r->m_vecChannelsIn); + r->m_channelTimestamp = timestamp; + r->m_vecChannelsIn = packets; + if (!timestamp || !packets) { + r->m_channelsAllocatedIn = 0; + return FALSE; + } + memset(r->m_channelTimestamp + r->m_channelsAllocatedIn, 0, sizeof(int) * (n - r->m_channelsAllocatedIn)); + memset(r->m_vecChannelsIn + r->m_channelsAllocatedIn, 0, sizeof(RTMPPacket*) * (n - r->m_channelsAllocatedIn)); + r->m_channelsAllocatedIn = n; + } + if (nSize == RTMP_LARGE_HEADER_SIZE) /* if we get a full header the timestamp is absolute */ packet->m_hasAbsTimestamp = TRUE; @@ -3248,7 +3271,7 @@ RTMP_SendChunk(RTMP *r, RTMPChunk *chunk) int RTMP_SendPacket(RTMP *r, RTMPPacket *packet, int queue) { - const RTMPPacket *prevPacket = r->m_vecChannelsOut[packet->m_nChannel]; + const RTMPPacket *prevPacket; uint32_t last = 0; int nSize; int hSize, cSize; @@ -3258,6 +3281,22 @@ RTMP_SendPacket(RTMP *r, RTMPPacket *packet, int queue) int nChunkSize; int tlen; + if (packet->m_nChannel >= r->m_channelsAllocatedOut) + { + int n = packet->m_nChannel + 10; + RTMPPacket **packets = realloc(r->m_vecChannelsOut, sizeof(RTMPPacket*) * n); + if (!packets) { + free(r->m_vecChannelsOut); + r->m_vecChannelsOut = NULL; + r->m_channelsAllocatedOut = 0; + return FALSE; + } + r->m_vecChannelsOut = packets; + memset(r->m_vecChannelsOut + r->m_channelsAllocatedOut, 0, sizeof(RTMPPacket*) * (n - r->m_channelsAllocatedOut)); + r->m_channelsAllocatedOut = n; + } + + prevPacket = r->m_vecChannelsOut[packet->m_nChannel]; if (prevPacket && packet->m_headerType != RTMP_PACKET_SIZE_LARGE) { /* compress a bit by using the prev packet's attributes */ @@ -3494,7 +3533,7 @@ RTMP_Close(RTMP *r) r->m_write.m_nBytesRead = 0; RTMPPacket_Free(&r->m_write); - for (i = 0; i < RTMP_CHANNELS; i++) + for (i = 0; i < r->m_channelsAllocatedIn; i++) { if (r->m_vecChannelsIn[i]) { @@ -3502,12 +3541,23 @@ RTMP_Close(RTMP *r) free(r->m_vecChannelsIn[i]); r->m_vecChannelsIn[i] = NULL; } + } + free(r->m_vecChannelsIn); + r->m_vecChannelsIn = NULL; + free(r->m_channelTimestamp); + r->m_channelTimestamp = NULL; + r->m_channelsAllocatedIn = 0; + for (i = 0; i < r->m_channelsAllocatedOut; i++) + { if (r->m_vecChannelsOut[i]) { free(r->m_vecChannelsOut[i]); r->m_vecChannelsOut[i] = NULL; } } + free(r->m_vecChannelsOut); + r->m_vecChannelsOut = NULL; + r->m_channelsAllocatedOut = 0; AV_clear(r->m_methodCalls, r->m_numCalls); r->m_methodCalls = NULL; r->m_numCalls = 0; diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h index 6b2ae5b..558e0ac 100644 --- a/librtmp/rtmp.h +++ b/librtmp/rtmp.h @@ -253,9 +253,11 @@ extern "C" int m_numCalls; RTMP_METHOD *m_methodCalls; /* remote method calls queue */ - RTMPPacket *m_vecChannelsIn[RTMP_CHANNELS]; - RTMPPacket *m_vecChannelsOut[RTMP_CHANNELS]; - int m_channelTimestamp[RTMP_CHANNELS]; /* abs timestamp of last packet */ + int m_channelsAllocatedIn; + int m_channelsAllocatedOut; + RTMPPacket **m_vecChannelsIn; + RTMPPacket **m_vecChannelsOut; + int *m_channelTimestamp; /* abs timestamp of last packet */ double m_fAudioCodecs; /* audioCodecs for the connect packet */ double m_fVideoCodecs; /* videoCodecs for the connect packet */ -- 1.7.9.4

2 2

[PATCH] Free skipped packets in RTMP_GetNextMediaPacket
by Martin Storsjo 30 May '12

30 May '12

--- librtmp/rtmp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 52d0254..37a05ad 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -1091,6 +1091,7 @@ RTMP_GetNextMediaPacket(RTMP *r, RTMPPacket *packet) packet->m_nTimeStamp, packet->m_hasAbsTimestamp, r->m_mediaStamp); #endif + RTMPPacket_Free(packet); continue; } r->m_pausing = 0; -- 1.7.9.4

1 0

Infinite loop bug: Network disconnects while publishing RTMP Stream
by Sreekanth Annapureddy 28 May '12

28 May '12

Dear All, I think I ran into a bug while publishing RTMP stream using librtmp. Consider the scenario when I disconnect from network on fly while publishing an RTMP audio/video stream. The WriteN() function detects that network is disconnected, and tries to close the RTMP session by calling RTMP_Close(). However, we seem to get into a infinite loop since RTMP_Close() calls SendFCUnpublish() which in turn calls WriteN(), and so on. Please let me know if this is indeed a bug or if my understanding is incorrect. Thanks for your time, Sreekanth

2 2

RTMP_Write function use issue
by Xiaopeng Wang 24 May '12

24 May '12

Dear rtmpdump Could you help to fix the following issu. I'm trying to use the librtmp library and it worked pretty well to pull a stream. But now I am trying to publish a stream and for that I believe I have to use the RTMP_Write function. What I am trying to accomplish here is a simple c++ program that will read from a file and try to push the stream to a crtmp server. The connection and stream creation is ok, but I'm quite puzzled by the use of RTMP_Write. Here is what I did: int Upload(RTMP * rtmp, FILE * file){ int nRead = 0; unsigned int nWrite = 0; int diff = 0; int bufferSize = 64 * 1024; int byteSum = 0; int count = 0; char * buffer; buffer = (char *) malloc(bufferSize); do{ nRead = fread(buffer+diff,1,bufferSize-diff,file); if(nRead != bufferSize){ if(feof(file)){ RTMP_LogPrintf("End of file reached!\n"); break; }else if(ferror(file)){ RTMP_LogPrintf("Error reading from file stream detected\n"); break; } } count += 1; byteSum += nRead; RTMP_LogPrintf("Read %d from file, Sum: %d, Count: %d\n",nRead,byteSum,count); nWrite = RTMP_Write(rtmp,buffer,nRead); if(nWrite != nRead){ diff = nRead - nWrite; memcpy(buffer,(const void*)(buffer+bufferSize-diff),diff); } }while(!RTMP_ctrlC && RTMP_IsConnected(rtmp) && !RTMP_IsTimedout(rtmp)); free(buffer); return RD_SUCCESS; } In this Upload function I am receiving the already initiallized RTMP structure and a pointer to an open file. This actually works and I can see some video being displayed, but it soon gets lost and stops sending packages. I managed to understand that it happens whenever the buffer that I setup (and which I randomly required to be 64k, no special reason for that) happens to split the flv tag (http://osflash.org/flv#flv_format) of a new package. For that I modified the RTMP_Write function and told it to verify if it will be able to decode the whole flv tag (packet type, body size, timestamp, etc..) and if it will not, then it should just return the amount of useful bytes left in the buffer. if(s2 - 11 <= 0){ rest = size - s2; return rest; } The code above takes notice of this, and if the value returned by RTMP_Write is not the amount of bytes it was supposed to send, then it knows that value is the amount of useful bytes left in the buffer. I then copy these bytes to the beginning of the buffer and read more from the file. But I keep getting problems with it, so I was wondering: what is the correct use of this function anyway? is there a specific buffer value that I should be using? (don't think so) or is it buggy by itself? Thanks

1 0

RTMPDump failing to record stream from GeorgiaTech Server
by Sagar Savla 23 May '12

23 May '12

Hello, Test video: http://www.gatech.edu/commencement/student-reflection-speaker-jarret-lafleu… (other test videos: http://www.gatech.edu/commencement/past-commencement-highlights) The media server: Wowza Problem: I used the following command to rip the video- rtmpdump -r http://wow.media.gatech.edu:1935/vod/_definst_/public/buzzbox/gatech.edu/co… S2012_LaFleurA.mp4 The file is downloaded. But the size is ~350MB. And the video does not play properly. I uploaded the same file to Youtube (I know they convert, but still) and you can see the difference at 2 minutes past. [ https://www.youtube.com/watch?v=BUj1p_-5iDU] The file is obviously unusable. I resorted to a commercial alternative to test... Replay Media Catcher [v4.3] It downloaded the file, it's a more realistic ~25Mb, and plays properly (in VLC) What is the problem? and how to work around it? Regards, Sagar K. Savla

2 1

[PATCH] Use CRLF newlines consistently for all HTTP POST headers
by Martin Storsjo 21 May '12

21 May '12

--- librtmp/rtmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 6cf2c85..8b3ceab 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -3729,8 +3729,8 @@ HTTP_Post(RTMP *r, RTMPTCmd cmd, const char *buf, int len) int hlen = snprintf(hbuf, sizeof(hbuf), "POST /%s%s/%d HTTP/1.1\r\n" "Host: %.*s:%d\r\n" "Accept: */*\r\n" - "User-Agent: Shockwave Flash\n" - "Connection: Keep-Alive\n" + "User-Agent: Shockwave Flash\r\n" + "Connection: Keep-Alive\r\n" "Cache-Control: no-cache\r\n" "Content-type: application/x-fcs\r\n" "Content-length: %d\r\n\r\n", RTMPT_cmds[cmd], -- 1.7.9.4

1 0

[PATCH 0/4] RTMPT fixes
by Martin Storsjo 21 May '12

21 May '12

Martin Storsjo (4): Add null termination to buffers before using strstr Buffer more data before returning successfully from HTTP_read, if needed Don't require 144 bytes to be buffered before proceeding with HTTP_read Refill if HTTP_read indicated it needs more data librtmp/rtmp.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) -- 1.7.9.4

1 4

[PATCH] Limit length of filename
by Steven Penny 21 May '12

21 May '12

In some cases YouTube RTMPE streams are generating filenames over 300 characters in length. Worst I saw was 336. Certain operating systems do not support names of this length. From my tests I set the limit to the max allowed. --- rtmpsrv.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/rtmpsrv.c b/rtmpsrv.c index 9aa62f3..16ac4c1 100644 --- a/rtmpsrv.c +++ b/rtmpsrv.c @@ -711,6 +711,12 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int if (*p == ':') *p = '_'; + /* Limit length of filename */ + if (av.av_len > 223) + { + av.av_len = 223; + } + /* Add extension if none present */ if (file[av.av_len - 4] != '.') { -- 1.7.9

2 1

[PATCH] Add quotes to -o value
by Steven Penny 21 May '12

21 May '12

If the -o value from rtmpsrv contains an ampersand (&), it will be interpreted as a command separator instead of part of the filename. This can be fixed by using quotes with the value. WRONG -o sparams=id%2Citag%2Crtmpe%2Csource%2Cexpire&expire=1337537678.flv RIGHT -o "sparams=id%2Citag%2Crtmpe%2Csource%2Cexpire&expire=1337537678.flv" I have seen this on YouTube. --- rtmpsrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rtmpsrv.c b/rtmpsrv.c index 9aa62f3..2ab80db 100644 --- a/rtmpsrv.c +++ b/rtmpsrv.c @@ -725,7 +725,7 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int argv[argc++].av_len = 2; argv[argc].av_val = file; argv[argc].av_len = av.av_len; - ptr += sprintf(ptr, " -o %s", file); + ptr += sprintf(ptr, " -o \"%s\"", file); now = RTMP_GetTime(); if (now - server->filetime < DUPTIME && AVMATCH(&argv[argc], &server->filename)) { -- 1.7.9

2 7

[PATCH 1/2] Add functions for doing server side TLS initialization
by Martin Storsjo 20 May '12

20 May '12

--- librtmp/rtmp.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++ librtmp/rtmp.h | 4 ++ librtmp/rtmp_sys.h | 20 ++++++++++ 3 files changed, 130 insertions(+) diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 52d0254..c0d043b 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -34,6 +34,19 @@ #ifdef CRYPTO #ifdef USE_POLARSSL #include <polarssl/havege.h> + +static const char *my_dhm_P = + "E4004C1F94182000103D883A448B3F80" \ + "2CE4B44A83301270002C20D0321CFD00" \ + "11CCEF784C26A400F43DFB901BCA7538" \ + "F2C6B176001CF5A0FD16D2C48B1D0C1C" \ + "F6AC8E1DA6BCC3B4E1F96B0564965300" \ + "FFA1D0B601EB2800F489AA512C4B248C" \ + "01F76949A60BB7F00A40B1EAB64BDD48" \ + "E8A700D60B7F1200FA8E77B0A979DABF"; + +static const char *my_dhm_G = "4"; + #elif defined(USE_GNUTLS) #include <gnutls/gnutls.h> #else /* USE_OPENSSL */ @@ -227,6 +240,82 @@ RTMP_TLS_Init() #endif } +void * +RTMP_TLS_AllocServerContext(const char* cert, const char* key) +{ + void *ctx = NULL; +#ifdef CRYPTO + if (!RTMP_TLS_ctx) + RTMP_TLS_Init(); +#ifdef USE_POLARSSL + tls_server_ctx *tc = ctx = calloc(1, sizeof(struct tls_server_ctx)); + tc->dhm_P = my_dhm_P; + tc->dhm_G = my_dhm_G; + tc->hs = &RTMP_TLS_ctx->hs; + if (x509parse_crtfile(&tc->cert, cert)) { + free(tc); + return NULL; + } + if (x509parse_keyfile(&tc->key, key, NULL)) { + x509_free(&tc->cert); + free(tc); + return NULL; + } +#elif defined(USE_GNUTLS) && !defined(NO_SSL) + gnutls_certificate_allocate_credentials((gnutls_certificate_credentials*) &ctx); + if (gnutls_certificate_set_x509_key_file(ctx, cert, key, GNUTLS_X509_FMT_PEM) != 0) { + gnutls_certificate_free_credentials(ctx); + return NULL; + } +#elif !defined(NO_SSL) /* USE_OPENSSL */ + ctx = SSL_CTX_new(SSLv23_server_method()); + FILE *f = fopen(key, "r"); + if (!f) { + SSL_CTX_free(ctx); + return NULL; + } + EVP_PKEY *k = PEM_read_PrivateKey(f, NULL, NULL, NULL); + fclose(f); + if (!k) { + SSL_CTX_free(ctx); + return NULL; + } + SSL_CTX_use_PrivateKey(ctx, k); + EVP_PKEY_free(k); + f = fopen(cert, "r"); + if (!f) { + SSL_CTX_free(ctx); + return NULL; + } + X509 *c = PEM_read_X509(f, NULL, NULL, NULL); + fclose(f); + if (!c) { + SSL_CTX_free(ctx); + return NULL; + } + SSL_CTX_use_certificate(ctx, c); + X509_free(c); +#endif +#endif + return ctx; +} + +void +RTMP_TLS_FreeServerContext(void *ctx) +{ +#ifdef CRYPTO +#ifdef USE_POLARSSL + x509_free(&((tls_server_ctx*)ctx)->cert); + rsa_free(&((tls_server_ctx*)ctx)->key); + free(ctx); +#elif defined(USE_GNUTLS) && !defined(NO_SSL) + gnutls_certificate_free_credentials(ctx); +#elif !defined(NO_SSL) /* USE_OPENSSL */ + SSL_CTX_free(ctx); +#endif +#endif +} + RTMP * RTMP_Alloc() { @@ -859,6 +948,23 @@ RTMP_Connect0(RTMP *r, struct sockaddr * service) } int +RTMP_TLS_Accept(RTMP *r, void *ctx) +{ +#if defined(CRYPTO) && !defined(NO_SSL) + TLS_server(ctx, r->m_sb.sb_ssl); + TLS_setfd(r->m_sb.sb_ssl, r->m_sb.sb_socket); + if (TLS_accept(r->m_sb.sb_ssl) < 0) + { + RTMP_Log(RTMP_LOGERROR, "%s, TLS_Connect failed", __FUNCTION__); + return FALSE; + } + return TRUE; +#else + return FALSE; +#endif +} + +int RTMP_Connect1(RTMP *r, RTMPPacket *cp) { if (r->Link.protocol & RTMP_FEATURE_SSL) diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h index 6b2ae5b..76e01fd 100644 --- a/librtmp/rtmp.h +++ b/librtmp/rtmp.h @@ -307,6 +307,7 @@ extern "C" int RTMP_Connect0(RTMP *r, struct sockaddr *svc); int RTMP_Connect1(RTMP *r, RTMPPacket *cp); int RTMP_Serve(RTMP *r); + int RTMP_TLS_Accept(RTMP *r, void *ctx); int RTMP_ReadPacket(RTMP *r, RTMPPacket *packet); int RTMP_SendPacket(RTMP *r, RTMPPacket *packet, int queue); @@ -329,6 +330,9 @@ extern "C" void RTMP_Free(RTMP *r); void RTMP_EnableWrite(RTMP *r); + void *RTMP_TLS_AllocServerContext(const char* cert, const char* key); + void RTMP_TLS_FreeServerContext(void *ctx); + int RTMP_LibVersion(void); void RTMP_UserInterrupt(void); /* user typed Ctrl-C */ diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h index c3fd4a6..c9c9410 100644 --- a/librtmp/rtmp_sys.h +++ b/librtmp/rtmp_sys.h @@ -68,14 +68,30 @@ typedef struct tls_ctx { havege_state hs; ssl_session ssn; } tls_ctx; +typedef struct tls_server_ctx { + havege_state *hs; + x509_cert cert; + rsa_context key; + ssl_session ssn; + const char *dhm_P, *dhm_G; +} tls_server_ctx; + #define TLS_CTX tls_ctx * #define TLS_client(ctx,s) s = malloc(sizeof(ssl_context)); ssl_init(s);\ ssl_set_endpoint(s, SSL_IS_CLIENT); ssl_set_authmode(s, SSL_VERIFY_NONE);\ ssl_set_rng(s, havege_rand, &ctx->hs);\ ssl_set_ciphersuites(s, ssl_default_ciphersuites);\ ssl_set_session(s, 1, 600, &ctx->ssn) +#define TLS_server(ctx,s) s = malloc(sizeof(ssl_context)); ssl_init(s);\ + ssl_set_endpoint(s, SSL_IS_SERVER); ssl_set_authmode(s, SSL_VERIFY_NONE);\ + ssl_set_rng(s, havege_rand, ((tls_server_ctx*)ctx)->hs);\ + ssl_set_ciphersuites(s, ssl_default_ciphersuites);\ + ssl_set_session(s, 1, 600, &((tls_server_ctx*)ctx)->ssn);\ + ssl_set_own_cert(s, &((tls_server_ctx*)ctx)->cert, &((tls_server_ctx*)ctx)->key);\ + ssl_set_dh_param(s, ((tls_server_ctx*)ctx)->dhm_P, ((tls_server_ctx*)ctx)->dhm_G) #define TLS_setfd(s,fd) ssl_set_bio(s, net_recv, &fd, net_send, &fd) #define TLS_connect(s) ssl_handshake(s) +#define TLS_accept(s) ssl_handshake(s) #define TLS_read(s,b,l) ssl_read(s,(unsigned char *)b,l) #define TLS_write(s,b,l) ssl_write(s,(unsigned char *)b,l) #define TLS_shutdown(s) ssl_close_notify(s) @@ -89,8 +105,10 @@ typedef struct tls_ctx { } tls_ctx; #define TLS_CTX tls_ctx * #define TLS_client(ctx,s) gnutls_init((gnutls_session_t *)(&s), GNUTLS_CLIENT); gnutls_priority_set(s, ctx->prios); gnutls_credentials_set(s, GNUTLS_CRD_CERTIFICATE, ctx->cred) +#define TLS_server(ctx,s) gnutls_init((gnutls_session_t *)(&s), GNUTLS_SERVER); gnutls_priority_set_direct(s, "NORMAL", NULL); gnutls_credentials_set(s, GNUTLS_CRD_CERTIFICATE, ctx) #define TLS_setfd(s,fd) gnutls_transport_set_ptr(s, (gnutls_transport_ptr_t)(long)fd) #define TLS_connect(s) gnutls_handshake(s) +#define TLS_accept(s) gnutls_handshake(s) #define TLS_read(s,b,l) gnutls_record_recv(s,b,l) #define TLS_write(s,b,l) gnutls_record_send(s,b,l) #define TLS_shutdown(s) gnutls_bye(s, GNUTLS_SHUT_RDWR) @@ -99,8 +117,10 @@ typedef struct tls_ctx { #else /* USE_OPENSSL */ #define TLS_CTX SSL_CTX * #define TLS_client(ctx,s) s = SSL_new(ctx) +#define TLS_server(ctx,s) s = SSL_new(ctx) #define TLS_setfd(s,fd) SSL_set_fd(s,fd) #define TLS_connect(s) SSL_connect(s) +#define TLS_accept(s) SSL_accept(s) #define TLS_read(s,b,l) SSL_read(s,b,l) #define TLS_write(s,b,l) SSL_write(s,b,l) #define TLS_shutdown(s) SSL_shutdown(s) -- 1.7.9.4

1 1