Changeset 5690:9205cac1fbb1 in roaraudio
- Timestamp:
- 10/12/12 17:10:53 (11 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
r5689 r5690 10 10 * Fixed segfault caused by strstr() in low level socket interface. 11 11 * Disabled gcrypt support by default. 12 * Improved handling of mixing OpenSSL enabled applications with 13 libroar without OpenSSL support. 12 14 13 15 v. 1.0beta6 - Fri Sep 21 2012 18:03 CEST -
include/libroar/vio_bio.h
r5381 r5690 39 39 #include "libroar.h" 40 40 41 #ifndef ROAR_HAVE_LIBSSL 42 typedef void BIO; 43 #endif 44 41 #ifdef ROAR_HAVE_LIBSSL 45 42 int roar_vio_open_bio (struct roar_vio_calls * calls, BIO * bio); 46 43 BIO * roar_vio_to_bio (struct roar_vio_calls * calls); 47 44 48 #ifdef ROAR_HAVE_LIBSSL49 45 ssize_t roar_vio_bio_read (struct roar_vio_calls * vio, void *buf, size_t count); 50 46 ssize_t roar_vio_bio_write (struct roar_vio_calls * vio, void *buf, size_t count); … … 52 48 int roar_vio_bio_sync (struct roar_vio_calls * vio); 53 49 int roar_vio_bio_close (struct roar_vio_calls * vio); 50 #else 51 int roar_vio_open_bio (struct roar_vio_calls * calls, void * bio); 52 void * roar_vio_to_bio (struct roar_vio_calls * calls); 54 53 #endif 55 54 -
libroar/vio_bio.c
r5388 r5690 36 36 #include "libroar.h" 37 37 38 #ifdef ROAR_HAVE_LIBSSL 38 39 int roar_vio_open_bio (struct roar_vio_calls * calls, BIO * bio) { 39 #ifdef ROAR_HAVE_LIBSSL40 40 if ( calls == NULL || bio == NULL ) 41 41 return -1; … … 54 54 55 55 return 0; 56 #else57 (void)calls, (void)bio;58 roar_err_set(ROAR_ERROR_NOSYS);59 return -1;60 #endif61 56 } 62 57 … … 66 61 } 67 62 68 #ifdef ROAR_HAVE_LIBSSL69 63 ssize_t roar_vio_bio_read (struct roar_vio_calls * vio, void *buf, size_t count) { 70 64 BIO * bio = (BIO*)(vio->inst); … … 106 100 #endif 107 101 102 #ifndef ROAR_HAVE_LIBSSL 103 int roar_vio_open_bio (struct roar_vio_calls * calls, void * bio) { 104 (void)calls, (void)bio; 105 roar_err_set(ROAR_ERROR_NOSYS); 106 return -1; 107 } 108 109 void * roar_vio_to_bio (struct roar_vio_calls * calls) { 110 roar_err_set(ROAR_ERROR_NOSYS); 111 return NULL; 112 } 113 #endif 114 108 115 //ll
Note: See TracChangeset
for help on using the changeset viewer.