I am travelling from Canada to India (round trip) Have Indian Passport do i need Transit visa?

My flight is from canada to shanghai and then to India Di I need a Tansit visa for Shangai?

and after a month i am coming back from india through Shanghai Pu Dong (PVG) to Los Angeles (LAX)
do i need a Intransit visa for Shanghai?
My Layover time is not more than 10 hr in both cases and iam not leaving the airport ..

Thanks