mirror of https://github.com/Icinga/icinga2.git
Added TcpClient::OnConnected event.
This commit is contained in:
Gunnar Beutner
parent
1fd0800780
commit
b162ca9bfb
|
|
@ -87,6 +87,11 @@ void TcpClient::Connect(const string& node, const string& service)
|
|||
continue;
|
||||
}
|
||||
|
||||
if (rc >= 0) {
|
||||
SetConnected(true);
|
||||
OnConnected(GetSelf());
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -102,6 +107,11 @@ void TcpClient::HandleWritable(void)
|
|||
char data[1024];
|
||||
size_t count;
|
||||
|
||||
if (!IsConnected()) {
|
||||
SetConnected(true);
|
||||
Event::Post(boost::bind(boost::cref(OnConnected), GetSelf()));
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
count = m_SendQueue->GetAvailableBytes();
|
||||
|
||||
|
|
@ -115,13 +125,8 @@ void TcpClient::HandleWritable(void)
|
|||
|
||||
rc = send(GetFD(), (const char *)data, count, 0);
|
||||
|
||||
if (rc <= 0) {
|
||||
SetConnected(false);
|
||||
|
||||
if (rc <= 0)
|
||||
throw_exception(SocketException("send() failed", GetError()));
|
||||
}
|
||||
|
||||
SetConnected(true);
|
||||
|
||||
m_SendQueue->Read(NULL, rc);
|
||||
}
|
||||
|
|
@ -169,6 +174,11 @@ void TcpClient::Write(const void *buffer, size_t count)
|
|||
|
||||
void TcpClient::HandleReadable(void)
|
||||
{
|
||||
if (!IsConnected()) {
|
||||
SetConnected(true);
|
||||
Event::Post(boost::bind(boost::cref(OnConnected), GetSelf()));
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
char data[1024];
|
||||
int rc = recv(GetFD(), data, sizeof(data), 0);
|
||||
|
|
@ -180,13 +190,8 @@ void TcpClient::HandleReadable(void)
|
|||
#endif /* _WIN32 */
|
||||
return;
|
||||
|
||||
if (rc <= 0) {
|
||||
SetConnected(false);
|
||||
|
||||
if (rc <= 0)
|
||||
throw_exception(SocketException("recv() failed", GetError()));
|
||||
}
|
||||
|
||||
SetConnected(true);
|
||||
|
||||
m_RecvQueue->Write(data, rc);
|
||||
}
|
||||
|
|
@ -211,7 +216,7 @@ bool TcpClient::WantsToRead(void) const
|
|||
*/
|
||||
bool TcpClient::WantsToWrite(void) const
|
||||
{
|
||||
return (m_SendQueue->GetAvailableBytes() > 0);
|
||||
return (m_SendQueue->GetAvailableBytes() > 0 || !IsConnected());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ public:
|
|||
|
||||
void Connect(const string& node, const string& service);
|
||||
|
||||
boost::signal<void (const TcpClient::Ptr&)> OnConnected;
|
||||
boost::signal<void (const TcpClient::Ptr&)> OnDataAvailable;
|
||||
|
||||
virtual size_t GetAvailableBytes(void) const;
|
||||
|
|
|
|||
|
|
@ -41,6 +41,8 @@ void TlsClient::Start(void)
|
|||
{
|
||||
m_SSL = shared_ptr<SSL>(SSL_new(m_SSLContext.get()), SSL_free);
|
||||
|
||||
m_SSLContext.reset();
|
||||
|
||||
if (!m_SSL)
|
||||
throw_exception(OpenSSLException("SSL_new failed", ERR_get_error()));
|
||||
|
||||
|
|
@ -54,18 +56,21 @@ void TlsClient::Start(void)
|
|||
|
||||
SSL_set_ex_data(m_SSL.get(), m_SSLIndex, this);
|
||||
|
||||
SSL_set_verify(m_SSL.get(), SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
|
||||
&TlsClient::SSLVerifyCertificate);
|
||||
SSL_set_verify(m_SSL.get(), SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
|
||||
|
||||
BIO *bio = BIO_new_socket(GetFD(), 0);
|
||||
SSL_set_bio(m_SSL.get(), bio, bio);
|
||||
SSL_set_fd(m_SSL.get(), GetFD());
|
||||
|
||||
if (GetRole() == RoleInbound)
|
||||
SSL_set_accept_state(m_SSL.get());
|
||||
else
|
||||
SSL_set_connect_state(m_SSL.get());
|
||||
|
||||
SSL_do_handshake(m_SSL.get());
|
||||
int rc = SSL_do_handshake(m_SSL.get());
|
||||
|
||||
if (rc == 1) {
|
||||
SetConnected(true);
|
||||
OnConnected(GetSelf());
|
||||
}
|
||||
|
||||
Socket::Start();
|
||||
}
|
||||
|
|
@ -124,6 +129,12 @@ void TlsClient::HandleReadable(void)
|
|||
rc = SSL_read(m_SSL.get(), data, sizeof(data));
|
||||
} else {
|
||||
rc = SSL_do_handshake(m_SSL.get());
|
||||
|
||||
if (rc == 1) {
|
||||
SetConnected(true);
|
||||
Event::Post(boost::bind(boost::cref(OnConnected), GetSelf()));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (rc <= 0) {
|
||||
|
|
@ -143,8 +154,6 @@ void TlsClient::HandleReadable(void)
|
|||
|
||||
if (IsConnected())
|
||||
m_RecvQueue->Write(data, rc);
|
||||
else
|
||||
SetConnected(true);
|
||||
}
|
||||
|
||||
post_event:
|
||||
|
|
@ -179,6 +188,12 @@ void TlsClient::HandleWritable(void)
|
|||
rc = SSL_write(m_SSL.get(), (const char *)data, count);
|
||||
} else {
|
||||
rc = SSL_do_handshake(m_SSL.get());
|
||||
|
||||
if (rc == 1) {
|
||||
SetConnected(true);
|
||||
Event::Post(boost::bind(boost::cref(OnConnected), GetSelf()));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (rc <= 0) {
|
||||
|
|
@ -198,8 +213,6 @@ void TlsClient::HandleWritable(void)
|
|||
|
||||
if (IsConnected())
|
||||
m_SendQueue->Read(NULL, rc);
|
||||
else
|
||||
SetConnected(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -260,36 +273,3 @@ TcpClient::Ptr icinga::TlsClientFactory(TcpClientRole role, shared_ptr<SSL_CTX>
|
|||
return boost::make_shared<TlsClient>(role, sslContext);
|
||||
}
|
||||
|
||||
/**
|
||||
* Callback function that verifies SSL certificates.
|
||||
*
|
||||
* @param ok Whether pre-checks for the SSL certificates were successful.
|
||||
* @param x509Context X509 context for the certificate.
|
||||
* @returns 1 if the verification was successful, 0 otherwise.
|
||||
*/
|
||||
int TlsClient::SSLVerifyCertificate(int ok, X509_STORE_CTX *x509Context)
|
||||
{
|
||||
SSL *ssl = (SSL *)X509_STORE_CTX_get_ex_data(x509Context, SSL_get_ex_data_X509_STORE_CTX_idx());
|
||||
TlsClient *client = (TlsClient *)SSL_get_ex_data(ssl, m_SSLIndex);
|
||||
|
||||
if (client == NULL)
|
||||
return 0;
|
||||
|
||||
return client->ValidateCertificateInternal(ok, x509Context);
|
||||
}
|
||||
|
||||
int TlsClient::ValidateCertificateInternal(int ok, X509_STORE_CTX *x509Context)
|
||||
{
|
||||
shared_ptr<X509> x509Certificate = shared_ptr<X509>(x509Context->cert, &TlsClient::NullCertificateDeleter);
|
||||
bool valid = ValidateCertificate((ok != 0), x509Context, x509Certificate);
|
||||
|
||||
if (valid)
|
||||
Event::Post(boost::bind(boost::ref(OnCertificateValidated), GetSelf()));
|
||||
|
||||
return valid ? 1 : 0;
|
||||
}
|
||||
|
||||
bool TlsClient::ValidateCertificate(bool ok, X509_STORE_CTX *x509Context, const shared_ptr<X509>& x509Certificate)
|
||||
{
|
||||
return ok;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,8 +38,6 @@ public:
|
|||
shared_ptr<X509> GetClientCertificate(void) const;
|
||||
shared_ptr<X509> GetPeerCertificate(void) const;
|
||||
|
||||
boost::signal<void (const TlsClient::Ptr&)> OnCertificateValidated;
|
||||
|
||||
protected:
|
||||
void HandleSSLError(void);
|
||||
|
||||
|
|
@ -49,8 +47,6 @@ protected:
|
|||
virtual void HandleReadable(void);
|
||||
virtual void HandleWritable(void);
|
||||
|
||||
virtual bool ValidateCertificate(bool ok, X509_STORE_CTX *x509Context, const shared_ptr<X509>& x509Certificate);
|
||||
|
||||
private:
|
||||
shared_ptr<SSL_CTX> m_SSLContext;
|
||||
shared_ptr<SSL> m_SSL;
|
||||
|
|
@ -64,9 +60,6 @@ private:
|
|||
virtual void CloseInternal(bool from_dtor);
|
||||
|
||||
static void NullCertificateDeleter(X509 *certificate);
|
||||
|
||||
static int SSLVerifyCertificate(int ok, X509_STORE_CTX *x509Context);
|
||||
int ValidateCertificateInternal(int ok, X509_STORE_CTX *x509Context);
|
||||
};
|
||||
|
||||
TcpClient::Ptr TlsClientFactory(TcpClientRole role, shared_ptr<SSL_CTX> sslContext);
|
||||
|
|
|
|||
|
|
@ -193,6 +193,8 @@ void CompatComponent::DumpServiceObject(ofstream& fp, Service service)
|
|||
*/
|
||||
void CompatComponent::StatusTimerHandler(void)
|
||||
{
|
||||
Logger::Write(LogInformation, "compat", "Writing compat status information");
|
||||
|
||||
ofstream statusfp;
|
||||
statusfp.open("status.dat.tmp", ofstream::out | ofstream::trunc);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
/* A Bison parser, made by GNU Bison 2.5. */
|
||||
|
||||
/* A Bison parser, made by GNU Bison 2.4.1. */
|
||||
|
||||
/* Skeleton implementation for Bison's Yacc-like parsers in C
|
||||
/* Bison implementation for Yacc-like parsers in C
|
||||
|
||||
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
|
||||
Free Software Foundation, Inc.
|
||||
Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -46,7 +44,7 @@
|
|||
#define YYBISON 1
|
||||
|
||||
/* Bison version. */
|
||||
#define YYBISON_VERSION "2.4.1"
|
||||
#define YYBISON_VERSION "2.5"
|
||||
|
||||
/* Skeleton name. */
|
||||
#define YYSKELETON_NAME "yacc.c"
|
||||
|
|
@ -68,8 +66,8 @@
|
|||
/* Copy the first part of user declarations. */
|
||||
|
||||
|
||||
/* Line 189 of yacc.c */
|
||||
#line 73 "config_parser.cc"
|
||||
/* Line 268 of yacc.c */
|
||||
#line 71 "config_parser.cc"
|
||||
|
||||
/* Enabling traces. */
|
||||
#ifndef YYDEBUG
|
||||
|
|
@ -91,7 +89,7 @@
|
|||
|
||||
/* "%code requires" blocks. */
|
||||
|
||||
/* Line 209 of yacc.c */
|
||||
/* Line 288 of yacc.c */
|
||||
#line 1 "config_parser.yy"
|
||||
|
||||
/******************************************************************************
|
||||
|
|
@ -122,8 +120,8 @@ using namespace icinga;
|
|||
|
||||
|
||||
|
||||
/* Line 209 of yacc.c */
|
||||
#line 127 "config_parser.cc"
|
||||
/* Line 288 of yacc.c */
|
||||
#line 125 "config_parser.cc"
|
||||
|
||||
/* Tokens. */
|
||||
#ifndef YYTOKENTYPE
|
||||
|
|
@ -170,7 +168,7 @@ using namespace icinga;
|
|||
typedef union YYSTYPE
|
||||
{
|
||||
|
||||
/* Line 214 of yacc.c */
|
||||
/* Line 293 of yacc.c */
|
||||
#line 38 "config_parser.yy"
|
||||
|
||||
char *text;
|
||||
|
|
@ -180,8 +178,8 @@ typedef union YYSTYPE
|
|||
|
||||
|
||||
|
||||
/* Line 214 of yacc.c */
|
||||
#line 185 "config_parser.cc"
|
||||
/* Line 293 of yacc.c */
|
||||
#line 183 "config_parser.cc"
|
||||
} YYSTYPE;
|
||||
# define YYSTYPE_IS_TRIVIAL 1
|
||||
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
|
||||
|
|
@ -204,7 +202,7 @@ typedef struct YYLTYPE
|
|||
|
||||
/* Copy the second part of user declarations. */
|
||||
|
||||
/* Line 264 of yacc.c */
|
||||
/* Line 343 of yacc.c */
|
||||
#line 65 "config_parser.yy"
|
||||
|
||||
|
||||
|
|
@ -234,8 +232,8 @@ void ConfigCompiler::Compile(void)
|
|||
|
||||
|
||||
|
||||
/* Line 264 of yacc.c */
|
||||
#line 239 "config_parser.cc"
|
||||
/* Line 343 of yacc.c */
|
||||
#line 237 "config_parser.cc"
|
||||
|
||||
#ifdef short
|
||||
# undef short
|
||||
|
|
@ -285,7 +283,7 @@ typedef short int yytype_int16;
|
|||
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
|
||||
|
||||
#ifndef YY_
|
||||
# if YYENABLE_NLS
|
||||
# if defined YYENABLE_NLS && YYENABLE_NLS
|
||||
# if ENABLE_NLS
|
||||
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
|
||||
# define YY_(msgid) dgettext ("bison-runtime", msgid)
|
||||
|
|
@ -338,11 +336,11 @@ YYID (yyi)
|
|||
# define alloca _alloca
|
||||
# else
|
||||
# define YYSTACK_ALLOC alloca
|
||||
# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
|
||||
# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|
||||
|| defined __cplusplus || defined _MSC_VER)
|
||||
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
|
||||
# ifndef _STDLIB_H
|
||||
# define _STDLIB_H 1
|
||||
# ifndef EXIT_SUCCESS
|
||||
# define EXIT_SUCCESS 0
|
||||
# endif
|
||||
# endif
|
||||
# endif
|
||||
|
|
@ -365,24 +363,24 @@ YYID (yyi)
|
|||
# ifndef YYSTACK_ALLOC_MAXIMUM
|
||||
# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
|
||||
# endif
|
||||
# if (defined __cplusplus && ! defined _STDLIB_H \
|
||||
# if (defined __cplusplus && ! defined EXIT_SUCCESS \
|
||||
&& ! ((defined YYMALLOC || defined malloc) \
|
||||
&& (defined YYFREE || defined free)))
|
||||
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
|
||||
# ifndef _STDLIB_H
|
||||
# define _STDLIB_H 1
|
||||
# ifndef EXIT_SUCCESS
|
||||
# define EXIT_SUCCESS 0
|
||||
# endif
|
||||
# endif
|
||||
# ifndef YYMALLOC
|
||||
# define YYMALLOC malloc
|
||||
# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
|
||||
# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|
||||
|| defined __cplusplus || defined _MSC_VER)
|
||||
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
|
||||
# endif
|
||||
# endif
|
||||
# ifndef YYFREE
|
||||
# define YYFREE free
|
||||
# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
|
||||
# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|
||||
|| defined __cplusplus || defined _MSC_VER)
|
||||
void free (void *); /* INFRINGES ON USER NAME SPACE */
|
||||
# endif
|
||||
|
|
@ -413,23 +411,7 @@ union yyalloc
|
|||
((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
|
||||
+ 2 * YYSTACK_GAP_MAXIMUM)
|
||||
|
||||
/* Copy COUNT objects from FROM to TO. The source and destination do
|
||||
not overlap. */
|
||||
# ifndef YYCOPY
|
||||
# if defined __GNUC__ && 1 < __GNUC__
|
||||
# define YYCOPY(To, From, Count) \
|
||||
__builtin_memcpy (To, From, (Count) * sizeof (*(From)))
|
||||
# else
|
||||
# define YYCOPY(To, From, Count) \
|
||||
do \
|
||||
{ \
|
||||
YYSIZE_T yyi; \
|
||||
for (yyi = 0; yyi < (Count); yyi++) \
|
||||
(To)[yyi] = (From)[yyi]; \
|
||||
} \
|
||||
while (YYID (0))
|
||||
# endif
|
||||
# endif
|
||||
# define YYCOPY_NEEDED 1
|
||||
|
||||
/* Relocate STACK from its old location to the new one. The
|
||||
local variables YYSIZE and YYSTACKSIZE give the old and new number of
|
||||
|
|
@ -449,6 +431,26 @@ union yyalloc
|
|||
|
||||
#endif
|
||||
|
||||
#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
|
||||
/* Copy COUNT objects from FROM to TO. The source and destination do
|
||||
not overlap. */
|
||||
# ifndef YYCOPY
|
||||
# if defined __GNUC__ && 1 < __GNUC__
|
||||
# define YYCOPY(To, From, Count) \
|
||||
__builtin_memcpy (To, From, (Count) * sizeof (*(From)))
|
||||
# else
|
||||
# define YYCOPY(To, From, Count) \
|
||||
do \
|
||||
{ \
|
||||
YYSIZE_T yyi; \
|
||||
for (yyi = 0; yyi < (Count); yyi++) \
|
||||
(To)[yyi] = (From)[yyi]; \
|
||||
} \
|
||||
while (YYID (0))
|
||||
# endif
|
||||
# endif
|
||||
#endif /* !YYCOPY_NEEDED */
|
||||
|
||||
/* YYFINAL -- State number of the termination state. */
|
||||
#define YYFINAL 2
|
||||
/* YYLAST -- Last index in YYTABLE. */
|
||||
|
|
@ -585,8 +587,8 @@ static const yytype_uint8 yyr2[] =
|
|||
1, 1, 1, 1, 1, 1, 1, 1, 1
|
||||
};
|
||||
|
||||
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
|
||||
STATE-NUM when YYTABLE doesn't specify something else to do. Zero
|
||||
/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
|
||||
Performed when YYTABLE doesn't specify something else to do. Zero
|
||||
means the default is an error. */
|
||||
static const yytype_uint8 yydefact[] =
|
||||
{
|
||||
|
|
@ -627,8 +629,7 @@ static const yytype_int8 yypgoto[] =
|
|||
|
||||
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
|
||||
positive, shift that token. If negative, reduce the rule which
|
||||
number is the opposite. If zero, do what YYDEFACT says.
|
||||
If YYTABLE_NINF, syntax error. */
|
||||
number is the opposite. If YYTABLE_NINF, syntax error. */
|
||||
#define YYTABLE_NINF -1
|
||||
static const yytype_uint8 yytable[] =
|
||||
{
|
||||
|
|
@ -639,6 +640,12 @@ static const yytype_uint8 yytable[] =
|
|||
26
|
||||
};
|
||||
|
||||
#define yypact_value_is_default(yystate) \
|
||||
((yystate) == (-17))
|
||||
|
||||
#define yytable_value_is_error(yytable_value) \
|
||||
YYID (0)
|
||||
|
||||
static const yytype_int8 yycheck[] =
|
||||
{
|
||||
3, 4, 5, 7, 8, 9, 10, 11, 0, 7,
|
||||
|
|
@ -672,9 +679,18 @@ static const yytype_uint8 yystos[] =
|
|||
|
||||
/* Like YYERROR except do call yyerror. This remains here temporarily
|
||||
to ease the transition to the new meaning of YYERROR, for GCC.
|
||||
Once GCC version 2 has supplanted version 1, this can go. */
|
||||
Once GCC version 2 has supplanted version 1, this can go. However,
|
||||
YYFAIL appears to be in use. Nevertheless, it is formally deprecated
|
||||
in Bison 2.4.2's NEWS entry, where a plan to phase it out is
|
||||
discussed. */
|
||||
|
||||
#define YYFAIL goto yyerrlab
|
||||
#if defined YYFAIL
|
||||
/* This is here to suppress warnings from the GCC cpp's
|
||||
-Wunused-macros. Normally we don't worry about that warning, but
|
||||
some users do, and we want to make it easy for users to remove
|
||||
YYFAIL uses, which will produce warnings from Bison 2.5. */
|
||||
#endif
|
||||
|
||||
#define YYRECOVERING() (!!yyerrstatus)
|
||||
|
||||
|
|
@ -684,7 +700,6 @@ do \
|
|||
{ \
|
||||
yychar = (Token); \
|
||||
yylval = (Value); \
|
||||
yytoken = YYTRANSLATE (yychar); \
|
||||
YYPOPSTACK (1); \
|
||||
goto yybackup; \
|
||||
} \
|
||||
|
|
@ -731,7 +746,7 @@ while (YYID (0))
|
|||
we won't break user code: when these are the locations we know. */
|
||||
|
||||
#ifndef YY_LOCATION_PRINT
|
||||
# if YYLTYPE_IS_TRIVIAL
|
||||
# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
|
||||
# define YY_LOCATION_PRINT(File, Loc) \
|
||||
fprintf (File, "%d.%d-%d.%d", \
|
||||
(Loc).first_line, (Loc).first_column, \
|
||||
|
|
@ -940,7 +955,6 @@ int yydebug;
|
|||
# define YYMAXDEPTH 10000
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#if YYERROR_VERBOSE
|
||||
|
||||
|
|
@ -1043,115 +1057,142 @@ yytnamerr (char *yyres, const char *yystr)
|
|||
}
|
||||
# endif
|
||||
|
||||
/* Copy into YYRESULT an error message about the unexpected token
|
||||
YYCHAR while in state YYSTATE. Return the number of bytes copied,
|
||||
including the terminating null byte. If YYRESULT is null, do not
|
||||
copy anything; just return the number of bytes that would be
|
||||
copied. As a special case, return 0 if an ordinary "syntax error"
|
||||
message will do. Return YYSIZE_MAXIMUM if overflow occurs during
|
||||
size calculation. */
|
||||
static YYSIZE_T
|
||||
yysyntax_error (char *yyresult, int yystate, int yychar)
|
||||
/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
|
||||
about the unexpected token YYTOKEN for the state stack whose top is
|
||||
YYSSP.
|
||||
|
||||
Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
|
||||
not large enough to hold the message. In that case, also set
|
||||
*YYMSG_ALLOC to the required number of bytes. Return 2 if the
|
||||
required number of bytes is too large to store. */
|
||||
static int
|
||||
yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
|
||||
yytype_int16 *yyssp, int yytoken)
|
||||
{
|
||||
int yyn = yypact[yystate];
|
||||
YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
|
||||
YYSIZE_T yysize = yysize0;
|
||||
YYSIZE_T yysize1;
|
||||
enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
|
||||
/* Internationalized format string. */
|
||||
const char *yyformat = 0;
|
||||
/* Arguments of yyformat. */
|
||||
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
|
||||
/* Number of reported tokens (one for the "unexpected", one per
|
||||
"expected"). */
|
||||
int yycount = 0;
|
||||
|
||||
if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
|
||||
return 0;
|
||||
else
|
||||
/* There are many possibilities here to consider:
|
||||
- Assume YYFAIL is not used. It's too flawed to consider. See
|
||||
<http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
|
||||
for details. YYERROR is fine as it does not invoke this
|
||||
function.
|
||||
- If this state is a consistent state with a default action, then
|
||||
the only way this function was invoked is if the default action
|
||||
is an error action. In that case, don't check for expected
|
||||
tokens because there are none.
|
||||
- The only way there can be no lookahead present (in yychar) is if
|
||||
this state is a consistent state with a default action. Thus,
|
||||
detecting the absence of a lookahead is sufficient to determine
|
||||
that there is no unexpected or expected token to report. In that
|
||||
case, just report a simple "syntax error".
|
||||
- Don't assume there isn't a lookahead just because this state is a
|
||||
consistent state with a default action. There might have been a
|
||||
previous inconsistent state, consistent state with a non-default
|
||||
action, or user semantic action that manipulated yychar.
|
||||
- Of course, the expected token list depends on states to have
|
||||
correct lookahead information, and it depends on the parser not
|
||||
to perform extra reductions after fetching a lookahead from the
|
||||
scanner and before detecting a syntax error. Thus, state merging
|
||||
(from LALR or IELR) and default reductions corrupt the expected
|
||||
token list. However, the list is correct for canonical LR with
|
||||
one exception: it will still contain any token that will not be
|
||||
accepted due to an error action in a later state.
|
||||
*/
|
||||
if (yytoken != YYEMPTY)
|
||||
{
|
||||
int yytype = YYTRANSLATE (yychar);
|
||||
YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
|
||||
YYSIZE_T yysize = yysize0;
|
||||
YYSIZE_T yysize1;
|
||||
int yysize_overflow = 0;
|
||||
enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
|
||||
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
|
||||
int yyx;
|
||||
int yyn = yypact[*yyssp];
|
||||
yyarg[yycount++] = yytname[yytoken];
|
||||
if (!yypact_value_is_default (yyn))
|
||||
{
|
||||
/* Start YYX at -YYN if negative to avoid negative indexes in
|
||||
YYCHECK. In other words, skip the first -YYN actions for
|
||||
this state because they are default actions. */
|
||||
int yyxbegin = yyn < 0 ? -yyn : 0;
|
||||
/* Stay within bounds of both yycheck and yytname. */
|
||||
int yychecklim = YYLAST - yyn + 1;
|
||||
int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
|
||||
int yyx;
|
||||
|
||||
# if 0
|
||||
/* This is so xgettext sees the translatable formats that are
|
||||
constructed on the fly. */
|
||||
YY_("syntax error, unexpected %s");
|
||||
YY_("syntax error, unexpected %s, expecting %s");
|
||||
YY_("syntax error, unexpected %s, expecting %s or %s");
|
||||
YY_("syntax error, unexpected %s, expecting %s or %s or %s");
|
||||
YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
|
||||
# endif
|
||||
char *yyfmt;
|
||||
char const *yyf;
|
||||
static char const yyunexpected[] = "syntax error, unexpected %s";
|
||||
static char const yyexpecting[] = ", expecting %s";
|
||||
static char const yyor[] = " or %s";
|
||||
char yyformat[sizeof yyunexpected
|
||||
+ sizeof yyexpecting - 1
|
||||
+ ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
|
||||
* (sizeof yyor - 1))];
|
||||
char const *yyprefix = yyexpecting;
|
||||
|
||||
/* Start YYX at -YYN if negative to avoid negative indexes in
|
||||
YYCHECK. */
|
||||
int yyxbegin = yyn < 0 ? -yyn : 0;
|
||||
|
||||
/* Stay within bounds of both yycheck and yytname. */
|
||||
int yychecklim = YYLAST - yyn + 1;
|
||||
int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
|
||||
int yycount = 1;
|
||||
|
||||
yyarg[0] = yytname[yytype];
|
||||
yyfmt = yystpcpy (yyformat, yyunexpected);
|
||||
|
||||
for (yyx = yyxbegin; yyx < yyxend; ++yyx)
|
||||
if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
|
||||
{
|
||||
if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
|
||||
{
|
||||
yycount = 1;
|
||||
yysize = yysize0;
|
||||
yyformat[sizeof yyunexpected - 1] = '\0';
|
||||
break;
|
||||
}
|
||||
yyarg[yycount++] = yytname[yyx];
|
||||
yysize1 = yysize + yytnamerr (0, yytname[yyx]);
|
||||
yysize_overflow |= (yysize1 < yysize);
|
||||
yysize = yysize1;
|
||||
yyfmt = yystpcpy (yyfmt, yyprefix);
|
||||
yyprefix = yyor;
|
||||
}
|
||||
|
||||
yyf = YY_(yyformat);
|
||||
yysize1 = yysize + yystrlen (yyf);
|
||||
yysize_overflow |= (yysize1 < yysize);
|
||||
yysize = yysize1;
|
||||
|
||||
if (yysize_overflow)
|
||||
return YYSIZE_MAXIMUM;
|
||||
|
||||
if (yyresult)
|
||||
{
|
||||
/* Avoid sprintf, as that infringes on the user's name space.
|
||||
Don't have undefined behavior even if the translation
|
||||
produced a string with the wrong number of "%s"s. */
|
||||
char *yyp = yyresult;
|
||||
int yyi = 0;
|
||||
while ((*yyp = *yyf) != '\0')
|
||||
{
|
||||
if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
|
||||
{
|
||||
yyp += yytnamerr (yyp, yyarg[yyi++]);
|
||||
yyf += 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
yyp++;
|
||||
yyf++;
|
||||
}
|
||||
}
|
||||
}
|
||||
return yysize;
|
||||
for (yyx = yyxbegin; yyx < yyxend; ++yyx)
|
||||
if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
|
||||
&& !yytable_value_is_error (yytable[yyx + yyn]))
|
||||
{
|
||||
if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
|
||||
{
|
||||
yycount = 1;
|
||||
yysize = yysize0;
|
||||
break;
|
||||
}
|
||||
yyarg[yycount++] = yytname[yyx];
|
||||
yysize1 = yysize + yytnamerr (0, yytname[yyx]);
|
||||
if (! (yysize <= yysize1
|
||||
&& yysize1 <= YYSTACK_ALLOC_MAXIMUM))
|
||||
return 2;
|
||||
yysize = yysize1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
switch (yycount)
|
||||
{
|
||||
# define YYCASE_(N, S) \
|
||||
case N: \
|
||||
yyformat = S; \
|
||||
break
|
||||
YYCASE_(0, YY_("syntax error"));
|
||||
YYCASE_(1, YY_("syntax error, unexpected %s"));
|
||||
YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
|
||||
YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
|
||||
YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
|
||||
YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
|
||||
# undef YYCASE_
|
||||
}
|
||||
|
||||
yysize1 = yysize + yystrlen (yyformat);
|
||||
if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
|
||||
return 2;
|
||||
yysize = yysize1;
|
||||
|
||||
if (*yymsg_alloc < yysize)
|
||||
{
|
||||
*yymsg_alloc = 2 * yysize;
|
||||
if (! (yysize <= *yymsg_alloc
|
||||
&& *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
|
||||
*yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Avoid sprintf, as that infringes on the user's name space.
|
||||
Don't have undefined behavior even if the translation
|
||||
produced a string with the wrong number of "%s"s. */
|
||||
{
|
||||
char *yyp = *yymsg;
|
||||
int yyi = 0;
|
||||
while ((*yyp = *yyformat) != '\0')
|
||||
if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
|
||||
{
|
||||
yyp += yytnamerr (yyp, yyarg[yyi++]);
|
||||
yyformat += 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
yyp++;
|
||||
yyformat++;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#endif /* YYERROR_VERBOSE */
|
||||
|
||||
|
||||
/*-----------------------------------------------.
|
||||
| Release the memory associated to this symbol. |
|
||||
|
|
@ -1188,6 +1229,7 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, context)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/* Prevent warnings from -Wmissing-prototypes. */
|
||||
#ifdef YYPARSE_PARAM
|
||||
#if defined __STDC__ || defined __cplusplus
|
||||
|
|
@ -1204,12 +1246,9 @@ int yyparse ();
|
|||
#endif /* ! YYPARSE_PARAM */
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*-------------------------.
|
||||
| yyparse or yypush_parse. |
|
||||
`-------------------------*/
|
||||
/*----------.
|
||||
| yyparse. |
|
||||
`----------*/
|
||||
|
||||
#ifdef YYPARSE_PARAM
|
||||
#if (defined __STDC__ || defined __C99__FUNC__ \
|
||||
|
|
@ -1273,7 +1312,7 @@ YYLTYPE yylloc;
|
|||
YYLTYPE *yylsp;
|
||||
|
||||
/* The locations where the error started and ended. */
|
||||
YYLTYPE yyerror_range[2];
|
||||
YYLTYPE yyerror_range[3];
|
||||
|
||||
YYSIZE_T yystacksize;
|
||||
|
||||
|
|
@ -1320,7 +1359,7 @@ YYLTYPE yylloc;
|
|||
yyvsp = yyvs;
|
||||
yylsp = yyls;
|
||||
|
||||
#if YYLTYPE_IS_TRIVIAL
|
||||
#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
|
||||
/* Initialize the default location before parsing starts. */
|
||||
yylloc.first_line = yylloc.last_line = 1;
|
||||
yylloc.first_column = yylloc.last_column = 1;
|
||||
|
|
@ -1422,7 +1461,7 @@ yybackup:
|
|||
|
||||
/* First try to decide what to do without reference to lookahead token. */
|
||||
yyn = yypact[yystate];
|
||||
if (yyn == YYPACT_NINF)
|
||||
if (yypact_value_is_default (yyn))
|
||||
goto yydefault;
|
||||
|
||||
/* Not known => get a lookahead token if don't already have one. */
|
||||
|
|
@ -1453,8 +1492,8 @@ yybackup:
|
|||
yyn = yytable[yyn];
|
||||
if (yyn <= 0)
|
||||
{
|
||||
if (yyn == 0 || yyn == YYTABLE_NINF)
|
||||
goto yyerrlab;
|
||||
if (yytable_value_is_error (yyn))
|
||||
goto yyerrlab;
|
||||
yyn = -yyn;
|
||||
goto yyreduce;
|
||||
}
|
||||
|
|
@ -1510,7 +1549,7 @@ yyreduce:
|
|||
{
|
||||
case 6:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 102 "config_parser.yy"
|
||||
{
|
||||
context->HandleInclude((yyvsp[(2) - (2)].text));
|
||||
|
|
@ -1519,7 +1558,7 @@ yyreduce:
|
|||
|
||||
case 7:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 107 "config_parser.yy"
|
||||
{
|
||||
m_Abstract = false;
|
||||
|
|
@ -1529,7 +1568,7 @@ yyreduce:
|
|||
|
||||
case 8:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 112 "config_parser.yy"
|
||||
{
|
||||
m_Item = boost::make_shared<ConfigItemBuilder>(yylloc);
|
||||
|
|
@ -1540,7 +1579,7 @@ yyreduce:
|
|||
|
||||
case 9:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 118 "config_parser.yy"
|
||||
{
|
||||
ExpressionList::Ptr exprl = *(yyvsp[(8) - (8)].variant);
|
||||
|
|
@ -1557,7 +1596,7 @@ yyreduce:
|
|||
|
||||
case 12:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 136 "config_parser.yy"
|
||||
{
|
||||
m_Abstract = true;
|
||||
|
|
@ -1566,7 +1605,7 @@ yyreduce:
|
|||
|
||||
case 13:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 140 "config_parser.yy"
|
||||
{
|
||||
m_Local = true;
|
||||
|
|
@ -1575,7 +1614,7 @@ yyreduce:
|
|||
|
||||
case 16:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 150 "config_parser.yy"
|
||||
{
|
||||
m_Item->AddParent((yyvsp[(1) - (1)].text));
|
||||
|
|
@ -1585,7 +1624,7 @@ yyreduce:
|
|||
|
||||
case 19:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 161 "config_parser.yy"
|
||||
{
|
||||
m_ExpressionLists.push(boost::make_shared<ExpressionList>());
|
||||
|
|
@ -1594,7 +1633,7 @@ yyreduce:
|
|||
|
||||
case 20:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 166 "config_parser.yy"
|
||||
{
|
||||
(yyval.variant) = new Variant(m_ExpressionLists.top());
|
||||
|
|
@ -1604,7 +1643,7 @@ yyreduce:
|
|||
|
||||
case 26:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 181 "config_parser.yy"
|
||||
{
|
||||
Expression expr((yyvsp[(1) - (3)].text), (yyvsp[(2) - (3)].op), *(yyvsp[(3) - (3)].variant), yylloc);
|
||||
|
|
@ -1617,7 +1656,7 @@ yyreduce:
|
|||
|
||||
case 27:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 189 "config_parser.yy"
|
||||
{
|
||||
Expression subexpr((yyvsp[(3) - (6)].text), (yyvsp[(5) - (6)].op), *(yyvsp[(6) - (6)].variant), yylloc);
|
||||
|
|
@ -1636,7 +1675,7 @@ yyreduce:
|
|||
|
||||
case 28:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 203 "config_parser.yy"
|
||||
{
|
||||
Expression expr((yyvsp[(1) - (1)].text), OperatorSet, (yyvsp[(1) - (1)].text), yylloc);
|
||||
|
|
@ -1648,7 +1687,7 @@ yyreduce:
|
|||
|
||||
case 33:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 216 "config_parser.yy"
|
||||
{
|
||||
(yyval.op) = (yyvsp[(1) - (1)].op);
|
||||
|
|
@ -1657,7 +1696,7 @@ yyreduce:
|
|||
|
||||
case 34:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 222 "config_parser.yy"
|
||||
{
|
||||
(yyval.variant) = new Variant((yyvsp[(1) - (1)].text));
|
||||
|
|
@ -1667,7 +1706,7 @@ yyreduce:
|
|||
|
||||
case 35:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 227 "config_parser.yy"
|
||||
{
|
||||
(yyval.variant) = new Variant((yyvsp[(1) - (1)].num));
|
||||
|
|
@ -1676,7 +1715,7 @@ yyreduce:
|
|||
|
||||
case 36:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 231 "config_parser.yy"
|
||||
{
|
||||
(yyval.variant) = new Variant();
|
||||
|
|
@ -1685,7 +1724,7 @@ yyreduce:
|
|||
|
||||
case 38:
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 238 "config_parser.yy"
|
||||
{
|
||||
(yyval.variant) = (yyvsp[(1) - (1)].variant);
|
||||
|
|
@ -1694,10 +1733,21 @@ yyreduce:
|
|||
|
||||
|
||||
|
||||
/* Line 1455 of yacc.c */
|
||||
#line 1699 "config_parser.cc"
|
||||
/* Line 1806 of yacc.c */
|
||||
#line 1738 "config_parser.cc"
|
||||
default: break;
|
||||
}
|
||||
/* User semantic actions sometimes alter yychar, and that requires
|
||||
that yytoken be updated with the new translation. We take the
|
||||
approach of translating immediately before every use of yytoken.
|
||||
One alternative is translating here after every semantic action,
|
||||
but that translation would be missed if the semantic action invokes
|
||||
YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
|
||||
if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
|
||||
incorrect destructor might then be invoked immediately. In the
|
||||
case of YYERROR or YYBACKUP, subsequent parser actions might lead
|
||||
to an incorrect destructor call or verbose syntax error message
|
||||
before the lookahead is translated. */
|
||||
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
|
||||
|
||||
YYPOPSTACK (yylen);
|
||||
|
|
@ -1726,6 +1776,10 @@ yyreduce:
|
|||
| yyerrlab -- here on detecting error |
|
||||
`------------------------------------*/
|
||||
yyerrlab:
|
||||
/* Make sure we have latest lookahead translation. See comments at
|
||||
user semantic actions for why this is necessary. */
|
||||
yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
|
||||
|
||||
/* If not already recovering from an error, report this error. */
|
||||
if (!yyerrstatus)
|
||||
{
|
||||
|
|
@ -1733,41 +1787,40 @@ yyerrlab:
|
|||
#if ! YYERROR_VERBOSE
|
||||
yyerror (&yylloc, context, YY_("syntax error"));
|
||||
#else
|
||||
# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
|
||||
yyssp, yytoken)
|
||||
{
|
||||
YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
|
||||
if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
|
||||
{
|
||||
YYSIZE_T yyalloc = 2 * yysize;
|
||||
if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
|
||||
yyalloc = YYSTACK_ALLOC_MAXIMUM;
|
||||
if (yymsg != yymsgbuf)
|
||||
YYSTACK_FREE (yymsg);
|
||||
yymsg = (char *) YYSTACK_ALLOC (yyalloc);
|
||||
if (yymsg)
|
||||
yymsg_alloc = yyalloc;
|
||||
else
|
||||
{
|
||||
yymsg = yymsgbuf;
|
||||
yymsg_alloc = sizeof yymsgbuf;
|
||||
}
|
||||
}
|
||||
|
||||
if (0 < yysize && yysize <= yymsg_alloc)
|
||||
{
|
||||
(void) yysyntax_error (yymsg, yystate, yychar);
|
||||
yyerror (&yylloc, context, yymsg);
|
||||
}
|
||||
else
|
||||
{
|
||||
yyerror (&yylloc, context, YY_("syntax error"));
|
||||
if (yysize != 0)
|
||||
goto yyexhaustedlab;
|
||||
}
|
||||
char const *yymsgp = YY_("syntax error");
|
||||
int yysyntax_error_status;
|
||||
yysyntax_error_status = YYSYNTAX_ERROR;
|
||||
if (yysyntax_error_status == 0)
|
||||
yymsgp = yymsg;
|
||||
else if (yysyntax_error_status == 1)
|
||||
{
|
||||
if (yymsg != yymsgbuf)
|
||||
YYSTACK_FREE (yymsg);
|
||||
yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
|
||||
if (!yymsg)
|
||||
{
|
||||
yymsg = yymsgbuf;
|
||||
yymsg_alloc = sizeof yymsgbuf;
|
||||
yysyntax_error_status = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
yysyntax_error_status = YYSYNTAX_ERROR;
|
||||
yymsgp = yymsg;
|
||||
}
|
||||
}
|
||||
yyerror (&yylloc, context, yymsgp);
|
||||
if (yysyntax_error_status == 2)
|
||||
goto yyexhaustedlab;
|
||||
}
|
||||
# undef YYSYNTAX_ERROR
|
||||
#endif
|
||||
}
|
||||
|
||||
yyerror_range[0] = yylloc;
|
||||
yyerror_range[1] = yylloc;
|
||||
|
||||
if (yyerrstatus == 3)
|
||||
{
|
||||
|
|
@ -1804,7 +1857,7 @@ yyerrorlab:
|
|||
if (/*CONSTCOND*/ 0)
|
||||
goto yyerrorlab;
|
||||
|
||||
yyerror_range[0] = yylsp[1-yylen];
|
||||
yyerror_range[1] = yylsp[1-yylen];
|
||||
/* Do not reclaim the symbols of the rule which action triggered
|
||||
this YYERROR. */
|
||||
YYPOPSTACK (yylen);
|
||||
|
|
@ -1823,7 +1876,7 @@ yyerrlab1:
|
|||
for (;;)
|
||||
{
|
||||
yyn = yypact[yystate];
|
||||
if (yyn != YYPACT_NINF)
|
||||
if (!yypact_value_is_default (yyn))
|
||||
{
|
||||
yyn += YYTERROR;
|
||||
if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
|
||||
|
|
@ -1838,7 +1891,7 @@ yyerrlab1:
|
|||
if (yyssp == yyss)
|
||||
YYABORT;
|
||||
|
||||
yyerror_range[0] = *yylsp;
|
||||
yyerror_range[1] = *yylsp;
|
||||
yydestruct ("Error: popping",
|
||||
yystos[yystate], yyvsp, yylsp, context);
|
||||
YYPOPSTACK (1);
|
||||
|
|
@ -1848,10 +1901,10 @@ yyerrlab1:
|
|||
|
||||
*++yyvsp = yylval;
|
||||
|
||||
yyerror_range[1] = yylloc;
|
||||
yyerror_range[2] = yylloc;
|
||||
/* Using YYLLOC is tempting, but would change the location of
|
||||
the lookahead. YYLOC is available though. */
|
||||
YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
|
||||
YYLLOC_DEFAULT (yyloc, yyerror_range, 2);
|
||||
*++yylsp = yyloc;
|
||||
|
||||
/* Shift the error token. */
|
||||
|
|
@ -1887,8 +1940,13 @@ yyexhaustedlab:
|
|||
|
||||
yyreturn:
|
||||
if (yychar != YYEMPTY)
|
||||
yydestruct ("Cleanup: discarding lookahead",
|
||||
yytoken, &yylval, &yylloc, context);
|
||||
{
|
||||
/* Make sure we have latest lookahead translation. See comments at
|
||||
user semantic actions for why this is necessary. */
|
||||
yytoken = YYTRANSLATE (yychar);
|
||||
yydestruct ("Cleanup: discarding lookahead",
|
||||
yytoken, &yylval, &yylloc, context);
|
||||
}
|
||||
/* Do not reclaim the symbols of the rule which action triggered
|
||||
this YYABORT or YYACCEPT. */
|
||||
YYPOPSTACK (yylen);
|
||||
|
|
@ -1913,7 +1971,7 @@ yyreturn:
|
|||
|
||||
|
||||
|
||||
/* Line 1675 of yacc.c */
|
||||
/* Line 2067 of yacc.c */
|
||||
#line 242 "config_parser.yy"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
/* A Bison parser, made by GNU Bison 2.5. */
|
||||
|
||||
/* A Bison parser, made by GNU Bison 2.4.1. */
|
||||
|
||||
/* Skeleton interface for Bison's Yacc-like parsers in C
|
||||
/* Bison interface for Yacc-like parsers in C
|
||||
|
||||
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
|
||||
Free Software Foundation, Inc.
|
||||
Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -34,7 +32,7 @@
|
|||
|
||||
/* "%code requires" blocks. */
|
||||
|
||||
/* Line 1676 of yacc.c */
|
||||
/* Line 2068 of yacc.c */
|
||||
#line 1 "config_parser.yy"
|
||||
|
||||
/******************************************************************************
|
||||
|
|
@ -65,8 +63,8 @@ using namespace icinga;
|
|||
|
||||
|
||||
|
||||
/* Line 1676 of yacc.c */
|
||||
#line 70 "config_parser.h"
|
||||
/* Line 2068 of yacc.c */
|
||||
#line 68 "config_parser.h"
|
||||
|
||||
/* Tokens. */
|
||||
#ifndef YYTOKENTYPE
|
||||
|
|
@ -113,7 +111,7 @@ using namespace icinga;
|
|||
typedef union YYSTYPE
|
||||
{
|
||||
|
||||
/* Line 1676 of yacc.c */
|
||||
/* Line 2068 of yacc.c */
|
||||
#line 38 "config_parser.yy"
|
||||
|
||||
char *text;
|
||||
|
|
@ -123,8 +121,8 @@ typedef union YYSTYPE
|
|||
|
||||
|
||||
|
||||
/* Line 1676 of yacc.c */
|
||||
#line 128 "config_parser.h"
|
||||
/* Line 2068 of yacc.c */
|
||||
#line 126 "config_parser.h"
|
||||
} YYSTYPE;
|
||||
# define YYSTYPE_IS_TRIVIAL 1
|
||||
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ void JsonRpcEndpoint::SetClient(JsonRpcClient::Ptr client)
|
|||
m_Client = client;
|
||||
client->OnNewMessage.connect(boost::bind(&JsonRpcEndpoint::NewMessageHandler, this, _2));
|
||||
client->OnClosed.connect(boost::bind(&JsonRpcEndpoint::ClientClosedHandler, this));
|
||||
client->OnCertificateValidated.connect(boost::bind(&JsonRpcEndpoint::CertificateValidatedHandler, this));
|
||||
client->OnConnected.connect(boost::bind(&JsonRpcEndpoint::ClientConnectedHandler, this));
|
||||
}
|
||||
|
||||
bool JsonRpcEndpoint::IsLocal(void) const
|
||||
|
|
@ -135,11 +135,7 @@ void JsonRpcEndpoint::ClientClosedHandler(void)
|
|||
// TODO: persist events, etc., for now we just disable the endpoint
|
||||
}
|
||||
|
||||
void JsonRpcEndpoint::ClientErrorHandler(const exception& ex)
|
||||
{
|
||||
}
|
||||
|
||||
void JsonRpcEndpoint::CertificateValidatedHandler(void)
|
||||
void JsonRpcEndpoint::ClientConnectedHandler(void)
|
||||
{
|
||||
string identity = Utility::GetCertificateCN(m_Client->GetPeerCertificate());
|
||||
|
||||
|
|
|
|||
|
|
@ -63,8 +63,7 @@ private:
|
|||
|
||||
void NewMessageHandler(const MessagePart& message);
|
||||
void ClientClosedHandler(void);
|
||||
void ClientErrorHandler(const std::exception& ex);
|
||||
void CertificateValidatedHandler(void);
|
||||
void ClientConnectedHandler(void);
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue