projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated server example.
[yazpp-moved-to-github.git]
/
src
/
yaz-server.cpp
diff --git
a/src/yaz-server.cpp
b/src/yaz-server.cpp
index
1d894a1
..
28bc965
100644
(file)
--- a/
src/yaz-server.cpp
+++ b/
src/yaz-server.cpp
@@
-3,7
+3,13
@@
* See the file LICENSE for details.
*
* $Log: yaz-server.cpp,v $
* See the file LICENSE for details.
*
* $Log: yaz-server.cpp,v $
- * Revision 1.9 2000-09-12 12:09:53 adam
+ * Revision 1.11 2000-09-12 16:23:49 adam
+ * Updated server example.
+ *
+ * Revision 1.10 2000/09/12 16:04:17 adam
+ * Added comstack method for Yaz_PDU_Assoc..
+ *
+ * Revision 1.9 2000/09/12 12:09:53 adam
* More work on high-level server.
*
* Revision 1.8 2000/09/08 10:23:42 adam
* More work on high-level server.
*
* Revision 1.8 2000/09/08 10:23:42 adam
@@
-64,20
+70,19
@@
private:
int m_no;
};
int m_no;
};
-static int stop = 0;
-
void MyServer::recv_Z_init (Z_InitRequest *initRequest,
Z_InitResponse *initResponse)
{
logf (LOG_LOG, "MyServer::recv_Z_init");
}
void MyServer::recv_Z_init (Z_InitRequest *initRequest,
Z_InitResponse *initResponse)
{
logf (LOG_LOG, "MyServer::recv_Z_init");
}
+static MyServer *myServer = 0;
+
void MyServer::recv_Z_search (Z_SearchRequest *searchRequest,
Z_SearchResponse *searchResponse)
{
logf (LOG_LOG, "MyServer::recv_Z_search");
void MyServer::recv_Z_search (Z_SearchRequest *searchRequest,
Z_SearchResponse *searchResponse)
{
logf (LOG_LOG, "MyServer::recv_Z_search");
- delete this;
- stop = 1;
+ myServer->close();
}
void MyServer::recv_Z_present (Z_PresentRequest *presentRequest,
}
void MyServer::recv_Z_present (Z_PresentRequest *presentRequest,
@@
-132,12
+137,13
@@
int main(int argc, char **argv)
{
while (1)
{
{
while (1)
{
- stop = 0;
Yaz_SocketManager mySocketManager;
Yaz_PDU_Assoc *my_PDU_Assoc = new Yaz_PDU_Assoc(&mySocketManager);
Yaz_SocketManager mySocketManager;
Yaz_PDU_Assoc *my_PDU_Assoc = new Yaz_PDU_Assoc(&mySocketManager);
- MyServer *z = new MyServer(my_PDU_Assoc);
-
+ myServer = new MyServer(my_PDU_Assoc);
+
+ MyServer *z = myServer;
+
if (argc <= 1)
z->server("@:9999");
else
if (argc <= 1)
z->server("@:9999");
else
@@
-145,10
+151,14
@@
int main(int argc, char **argv)
for (int i = 1; i < argc; i++)
z->server(argv[i]);
}
for (int i = 1; i < argc; i++)
z->server(argv[i]);
}
- while (!stop && mySocketManager.processEvent() > 0)
- ;
+ COMSTACK cs = my_PDU_Assoc->comstack();
+ if (cs)
+ printf ("fd=%d\n", cs_fileno(cs));
+ while (mySocketManager.processEvent() > 0)
+ ;
logf (LOG_LOG, "bailing out");
delete z;
logf (LOG_LOG, "bailing out");
delete z;
+ break;
}
return 0;
}
}
return 0;
}