← Back to branch summary

~ubuntu-branches/ubuntu/trusty/syslog-ng/trusty-proposed

« back to all changes in this revision

Viewing changes to modules/afsocket/afsocket.c

  • Committer: Package Import Robot
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2013-05-26 09:06:21 UTC
  • mfrom: (1.3.11)
  • Revision ID: package-import@ubuntu.com-20130526090621-8z2s0oi21eoljb9x
Tags: 3.3.9-1
http://bugs.debian.org/708793
* New upstream release.
* Include missed ivykis header (closes: #708793).

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/afsocket/afsocket.c
26
26
#include "driver.h"
27
27
#include "misc.h"
28
28
#include "logwriter.h"
29
 
#if ENABLE_SSL
 
29
#if BUILD_WITH_SSL
30
30
#include "tlstransport.h"
31
31
#endif
32
32
#include "gprocess.h"
166
166
 
167
167
  if (!self->peer_addr)
168
168
    {
169
 
      return NULL;
 
169
      if (self->owner->bind_addr)
 
170
        {
 
171
          g_sockaddr_format(self->owner->bind_addr, buf, sizeof(buf), GSA_ADDRESS_ONLY);
 
172
          return buf;
 
173
        }
 
174
      else
 
175
        return NULL;
170
176
    }
171
177
  if ((self->owner->flags & AFSOCKET_SYSLOG_PROTOCOL) == 0)
172
178
    {
193
199
  read_flags = ((self->owner->flags & AFSOCKET_DGRAM) ? LTF_RECV : 0);
194
200
  if (!self->reader)
195
201
    {
196
 
#if ENABLE_SSL
 
202
#if BUILD_WITH_SSL
197
203
      if (self->owner->tls_context)
198
204
        {
199
205
          TLSSession *tls_session = tls_context_setup_session(self->owner->tls_context);
393
399
  self->max_connections = max_connections;
394
400
}
395
401
 
396
 
#if ENABLE_SSL
 
402
#if BUILD_WITH_SSL
397
403
void
398
404
afsocket_sd_set_tls_context(LogDriver *s, TLSContext *tls_context)
399
405
{
789
795
  g_sockaddr_unref(self->bind_addr);
790
796
  self->bind_addr = NULL;
791
797
  g_free(self->transport);
792
 
#if ENABLE_SSL
 
798
#if BUILD_WITH_SSL
793
799
  if(self->tls_context)
794
800
    {
795
801
      tls_context_free(self->tls_context);
858
864
  self->transport = g_strdup(transport);
859
865
}
860
866
 
861
 
#if ENABLE_SSL
 
867
#if BUILD_WITH_SSL
862
868
void
863
869
afsocket_dd_set_tls_context(LogDriver *s, TLSContext *tls_context)
864
870
{
941
947
    }
942
948
}
943
949
 
944
 
#if ENABLE_SSL
 
950
#if BUILD_WITH_SSL
945
951
static gint
946
952
afsocket_dd_tls_verify_callback(gint ok, X509_STORE_CTX *ctx, gpointer user_data)
947
953
{
1059
1065
              NULL);
1060
1066
 
1061
1067
 
1062
 
#if ENABLE_SSL
 
1068
#if BUILD_WITH_SSL
1063
1069
  if (self->tls_context)
1064
1070
    {
1065
1071
      TLSSession *tls_session;
1190
1196
       * even while the connection is not established */
1191
1197
 
1192
1198
      self->writer = log_writer_new(LW_FORMAT_PROTO |
1193
 
#if ENABLE_SSL
 
1199
#if BUILD_WITH_SSL
1194
1200
                                    (((self->flags & AFSOCKET_STREAM) && !self->tls_context) ? LW_DETECT_EOF : 0) |
1195
1201
#else
1196
1202
                                    ((self->flags & AFSOCKET_STREAM) ? LW_DETECT_EOF : 0) |
1272
1278
  g_free(self->hostname);
1273
1279
  g_free(self->dest_name);
1274
1280
  g_free(self->transport);
1275
 
#if ENABLE_SSL
 
1281
#if BUILD_WITH_SSL
1276
1282
  if(self->tls_context)
1277
1283
    {
1278
1284
      tls_context_free(self->tls_context);