aboutsummaryrefslogtreecommitdiff
path: root/src/daemon/https/tls/gnutls_buffers.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/daemon/https/tls/gnutls_buffers.c')
-rw-r--r--src/daemon/https/tls/gnutls_buffers.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/daemon/https/tls/gnutls_buffers.c b/src/daemon/https/tls/gnutls_buffers.c
index 16be8011..5ea95e5f 100644
--- a/src/daemon/https/tls/gnutls_buffers.c
+++ b/src/daemon/https/tls/gnutls_buffers.c
@@ -487,7 +487,6 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
487 if (sizeOfPtr > MAX_RECV_SIZE || sizeOfPtr == 0) 487 if (sizeOfPtr > MAX_RECV_SIZE || sizeOfPtr == 0)
488 { 488 {
489 gnutls_assert (); /* internal error */ 489 gnutls_assert (); /* internal error */
490 printf("AT %u\n", __LINE__);
491 return GNUTLS_E_INVALID_REQUEST; 490 return GNUTLS_E_INVALID_REQUEST;
492 } 491 }
493 492
@@ -538,7 +537,6 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
538 > MAX_RECV_SIZE) 537 > MAX_RECV_SIZE)
539 { 538 {
540 gnutls_assert (); /* internal error */ 539 gnutls_assert (); /* internal error */
541 printf("AT %u\n", __LINE__);
542 return GNUTLS_E_INVALID_REQUEST; 540 return GNUTLS_E_INVALID_REQUEST;
543 } 541 }
544 542
@@ -551,14 +549,12 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
551 if (session->internals.record_recv_buffer.data == NULL) 549 if (session->internals.record_recv_buffer.data == NULL)
552 { 550 {
553 gnutls_assert (); 551 gnutls_assert ();
554 printf("AT %u\n", __LINE__);
555 return GNUTLS_E_MEMORY_ERROR; 552 return GNUTLS_E_MEMORY_ERROR;
556 } 553 }
557 554
558 buf_pos = session->internals.record_recv_buffer.length; 555 buf_pos = session->internals.record_recv_buffer.length;
559 buf = session->internals.record_recv_buffer.data; 556 buf = session->internals.record_recv_buffer.data;
560 *iptr = buf; 557 *iptr = buf;
561 printf("AT %u\n", __LINE__);
562 558
563 /* READ DATA - but leave RCVLOWAT bytes in the kernel buffer. */ 559 /* READ DATA - but leave RCVLOWAT bytes in the kernel buffer. */
564 if (recvdata - recvlowat > 0) 560 if (recvdata - recvlowat > 0)
@@ -570,7 +566,6 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
570 */ 566 */
571 if (ret < 0 && MHD_gtls_error_is_fatal (ret) == 0) 567 if (ret < 0 && MHD_gtls_error_is_fatal (ret) == 0)
572 { 568 {
573 printf("AT %u\n", __LINE__);
574 return ret; 569 return ret;
575 } 570 }
576 } 571 }
@@ -598,7 +593,6 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
598 593
599 if (ret2 < 0 && MHD_gtls_error_is_fatal (ret2) == 0) 594 if (ret2 < 0 && MHD_gtls_error_is_fatal (ret2) == 0)
600 { 595 {
601 printf("AT %u\n", __LINE__);
602 return ret2; 596 return ret2;
603 } 597 }
604 598
@@ -618,7 +612,6 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
618 { 612 {
619 gnutls_assert (); 613 gnutls_assert ();
620 /* that's because they are initialized to 0 */ 614 /* that's because they are initialized to 0 */
621 printf("AT %u\n", __LINE__);
622 return MIN (ret, ret2); 615 return MIN (ret, ret2);
623 } 616 }
624 617
@@ -627,14 +620,12 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
627 if (ret > 0 && ret < recvlowat) 620 if (ret > 0 && ret < recvlowat)
628 { 621 {
629 gnutls_assert (); 622 gnutls_assert ();
630 printf("AT %u\n", __LINE__);
631 return GNUTLS_E_AGAIN; 623 return GNUTLS_E_AGAIN;
632 } 624 }
633 625
634 if (ret == 0) 626 if (ret == 0)
635 { /* EOF */ 627 { /* EOF */
636 gnutls_assert (); 628 gnutls_assert ();
637 printf("AT %u\n", __LINE__);
638 return 0; 629 return 0;
639 } 630 }
640 631
@@ -644,12 +635,10 @@ mhd_gtls_io_read_buffered (mhd_gtls_session_t session, opaque ** iptr,
644 { 635 {
645 /* Short Read */ 636 /* Short Read */
646 gnutls_assert (); 637 gnutls_assert ();
647 printf("AT %u\n", __LINE__);
648 return GNUTLS_E_AGAIN; 638 return GNUTLS_E_AGAIN;
649 } 639 }
650 else 640 else
651 { 641 {
652 printf("AT %u\n", __LINE__);
653 return ret; 642 return ret;
654 } 643 }
655} 644}
@@ -1234,7 +1223,7 @@ mhd_gtls_handshake_buffer_get_ptr (mhd_gtls_session_t session,
1234 if (length != NULL) 1223 if (length != NULL)
1235 *length = session->internals.handshake_hash_buffer.length; 1224 *length = session->internals.handshake_hash_buffer.length;
1236 1225
1237 _gnutls_buffers_log ("BUF[HSK]: Peeked %d bytes of Data\n", 1226 _gnutls_buffers_log ("BUF[HSK]: Peeked %d bytes of Data\n",
1238 session->internals.handshake_hash_buffer.length); 1227 session->internals.handshake_hash_buffer.length);
1239 1228
1240 if (data_ptr != NULL) 1229 if (data_ptr != NULL)