Commit Graph

124 Commits

Author SHA1 Message Date
Craig Tiller 61691f92c3 Merge github.com:grpc/grpc into credit 2015-03-02 08:51:52 -08:00
Nicolas "Pixel" Noble 1ff52d5278 Guard headers tool. 2015-03-01 06:18:14 +01:00
vjpai 4e1e1bc28e Revert "Use typedefs to avoid triply-nested function templates"
This reverts commit 45b0bc4bec.

This revert is being done because the compilers on Travis don't
understand the C++11 template/using syntax.
2015-02-27 23:47:12 -08:00
vjpai 45b0bc4bec Use typedefs to avoid triply-nested function templates 2015-02-27 16:54:17 -08:00
vjpai 5b39f9a9fb refresh -> Reset 2015-02-27 09:33:00 -08:00
vjpai 6e2e64a8b4 Stop abusing operator() overloading 2015-02-27 09:28:28 -08:00
vjpai 9440a14558 Move std::bind call out of main loop, change constructor appropriately 2015-02-27 09:19:09 -08:00
vjpai cd801c8531 <:: -> < :: 2015-02-27 07:21:31 -08:00
vjpai 3c11066217 override->GRPC_OVERRIDE 2015-02-27 07:17:16 -08:00
vjpai 1b47b12895 Merge remote-tracking branch 'upstream/master' 2015-02-26 23:16:25 -08:00
Vijay Pai 64ac47f389 clang-format all these files 2015-02-26 17:59:51 -08:00
vjpai 56c5129629 Rename Async methods from generator to avoid naming conflicts to
bind and other functions
2015-02-26 17:01:35 -08:00
vjpai dea740f329 New multithreaded async C++ tests. The server is architected the way
that it should be with multiple threads waiting on a single
completion queue.
The client currently uses a separate completion
queue per-thread, as trying to do a single unified queue was leading
to crashes for me. I need to figure that out.
2015-02-26 16:35:35 -08:00
Craig Tiller cf133f41f8 Make it possible to compile with gcc4.6 2015-02-26 14:27:05 -08:00
Craig Tiller 29f1314282 Merge github.com:grpc/grpc into credit 2015-02-26 11:23:01 -08:00
Craig Tiller 36ccead403 Merge pull request #735 from jboeuf/fix_ssl_san
Verifying the peer name on the X509 Certs correctly.
2015-02-24 21:11:26 -08:00
Craig Tiller 25f6cd7a97 Merge github.com:grpc/grpc into credit
Conflicts:
	examples/pubsub/publisher_test.cc
	examples/pubsub/subscriber_test.cc
	include/grpc++/create_channel.h
	src/cpp/client/create_channel.cc
	test/cpp/end2end/async_end2end_test.cc
	test/cpp/end2end/end2end_test.cc
	test/cpp/util/create_test_channel.cc
2015-02-24 08:12:05 -08:00
Craig Tiller b9d91eb454 Merge github.com:google/grpc into deprecate-c++
Conflicts:
	test/cpp/end2end/async_end2end_test.cc
	test/cpp/end2end/end2end_test.cc
2015-02-23 17:13:40 -08:00
Yang Gao 0b9dfcf02a Merge pull request #725 from ctiller/unique
Move to unique_ptr for all GRPC returned objects
2015-02-23 17:02:47 -08:00
Julien Boeuf 597a4f2273 Verifying the peer name on the X509 Certs correctly.
- The SANs take precedence over the CN.
- The CN is only checked if there are no SANs.
- Fixing the tests as the test cert did not list *.test.google.com in
  the SANs. Will fix the test cert another time...
2015-02-23 16:41:26 -08:00
Craig Tiller e8eb8a4fd4 Merge github.com:grpc/grpc into credit 2015-02-23 14:56:42 -08:00
Craig Tiller 74ae8f61d9 Merge pull request #710 from jboeuf/default_google_creds
Added support for default credentials.
2015-02-23 14:41:18 -08:00
Craig Tiller e4fe844b67 s/CreateChannel/CreateChannelDeprecated
For the 2-argument version of CreateChannel.

This is a temporary step until #711 is ready to roll out.
2015-02-23 13:55:15 -08:00
Julien Boeuf c66f2a816e Addressing iniitial feedback.
- Renaming default credentials -> google default credentials.
- Various other things in cpp:
  - Adding Cpp wrapping for JWT Tokens.
  - Renaming ComposeCredentials -> CompositeCredentials.
2015-02-23 13:00:36 -08:00
Craig Tiller fd1b49b757 Move to unique_ptr for all GRPC returned objects 2015-02-23 12:53:39 -08:00
Craig Tiller 42bc87c097 Update C++ server with new core API
And reflects the C++ API in ServerBuilder.
2015-02-23 09:58:23 -08:00
Craig Tiller 47c83fdaf7 Credentials prototyping
- Remove CredentialsFactory as it's unnecessary
- Effectively make Credentials a channel factory, allowing different credential types to create different channel types - this gives us a hook so that InsecureCredentials can at runtime instantiate a different kind of channel as required - giving us a way of generating an openssl free version of grpc++.
- Server credentials not touched yet, but they'll need to be updated.
2015-02-23 09:58:22 -08:00
Craig Tiller fe8af4e2e9 Rename interop_test.c --> interop_test.cc
We have many assumptions about languages baked into the test system, and we want this test harness to trigger when testing C++ stuff, so it needs to be written in C++.
2015-02-21 07:04:49 -08:00
Michael Lumish 00bdbe64a0 Merge pull request #669 from yang-g/comments
clean up some internal path and names
2015-02-20 14:52:32 -08:00
Nicolas Noble d539f69c72 Merge pull request #663 from vjpai/python
Minor changes for compatibility across different compilers
2015-02-20 14:46:15 -08:00
Craig Tiller 2f3e2ec865 Make interop server respond to sigint
This will allow the test to shut down cleanly, and avoid failing.
2015-02-20 13:07:50 -08:00
Yang Gao bbd67c0499 clean up some internal path and names 2015-02-20 13:04:52 -08:00
vjpai 5b47818d93 Some compilers not happy with <:: and need < :: instead 2015-02-20 11:42:42 -08:00
Craig Tiller 16a6ea6bc0 Ensure interop tests are run as part of run_tests
I'm honestly a little shocked this wasn't done previously.
2015-02-20 09:08:54 -08:00
Nicolas "Pixel" Noble 7e80efcb3d Making the usage of gflags uniform across distributions. 2015-02-20 03:13:38 +01:00
Nicolas "Pixel" Noble ba6082080c Fixing gflags' include path. 2015-02-20 02:48:03 +01:00
Nicolas Noble 980a630e7f Merge pull request #605 from vjpai/mac
Mac build is now ready
2015-02-19 10:17:03 -08:00
vjpai d5577aac67 More typecasts to avoid sign-comparison problems on EXPECT_EQ 2015-02-18 22:26:48 -08:00
vjpai c1231eb543 Include typecasts so that int and size_t are not compared (since their
signs don't match)
2015-02-18 22:15:14 -08:00
Craig Tiller 2d11c93ab5 Merge github.com:grpc/grpc into an-update-on-c++ 2015-02-18 15:51:50 -08:00
Craig Tiller 8a287d1a1b Merge pull request #588 from yang-g/c++api
Async client api change. Add a ClientAsyncResponseReader.
2015-02-18 14:50:14 -08:00
Yang Gao 3a5e5495e5 Async client api change. Add a ClientAsyncResponseReader. Make the api similar to streaming and symmetric to server side. 2015-02-18 14:32:38 -08:00
Craig Tiller eaaee49f9b Merge github.com:grpc/grpc into an-update-on-c++ 2015-02-18 13:14:15 -08:00
Craig Tiller 492968f7d9 Server side cancellation receive support 2015-02-18 13:14:03 -08:00
Craig Tiller ce5021b0b9 Add missing new-lines at end of file 2015-02-18 09:25:21 -08:00
Craig Tiller 190d360def Add missing new-lines at end of file 2015-02-18 09:23:38 -08:00
Craig Tiller 0605995e55 Update copyright to 2015 2015-02-18 08:34:56 -08:00
Craig Tiller f74ec4ee43 Merge github.com:grpc/grpc into copyright 2015-02-18 08:30:14 -08:00
Yang Gao da699b8bc1 do not leak reader or writer 2015-02-18 01:10:22 -08:00
Yang Gao 2b7f537546 Add metadata test with rpc. Adding/fixing things to make it work 2015-02-18 00:45:53 -08:00